From ab5c89c796a6d9dfb40cb0ddb56dc185bcd36a49 Mon Sep 17 00:00:00 2001 From: chomik Date: Sat, 1 Jun 2019 16:37:55 +0200 Subject: [PATCH] typography fixes --- scss/_variables.scss | 14 ++++++++------ scss/layout/_core.scss | 5 +++++ scss/layout/_page.scss | 2 +- scss/ui/_cards.scss | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 228ec1ce..5de3e32a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -105,7 +105,7 @@ $avatar-sizes: ( "xl": 6rem ) !default; -$font-size-base: 1rem !default; +$font-size-base: .9375rem !default; $font-weight-base: 400 !default; $line-height-base: 1.5 !default; @@ -116,12 +116,14 @@ Typography */ $headings-font-weight: 600 !default; -$h1-font-size: $font-size-base * 1.25 * 1.25 * 1.25 !default; -$h2-font-size: $font-size-base * 1.25 * 1.25 !default; -$h3-font-size: $font-size-base * 1.25 !default; +$small-font-size: 83.33333% !default; + +$h1-font-size: $font-size-base * 1.2 * 1.2 * 1.2 !default; +$h2-font-size: $font-size-base * 1.2 * 1.2 !default; +$h3-font-size: $font-size-base * 1.2 !default; $h4-font-size: $font-size-base !default; -$h5-font-size: $font-size-base * .8 !default; -$h6-font-size: $font-size-base * .8 * .8 !default; +$h5-font-size: $font-size-base * .833333 !default; +$h6-font-size: $font-size-base * .833333 * .83333 !default; /** Ribbons diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss index 1b81177c..0f2baa26 100644 --- a/scss/layout/_core.scss +++ b/scss/layout/_core.scss @@ -1,6 +1,11 @@ // stylelint-disable property-no-vendor-prefix html { height: 100%; + font-size: 16px; + + @include media-breakpoint-down(md) { + font-size: 15px; + } } body { diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 56f46753..bcaba6fd 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -8,7 +8,7 @@ .page-title { margin: 0; - font-size: $h4-font-size; + font-size: $h3-font-size; font-weight: 400; line-height: 2.5rem; } diff --git a/scss/ui/_cards.scss b/scss/ui/_cards.scss index b410b02e..cc1c3822 100644 --- a/scss/ui/_cards.scss +++ b/scss/ui/_cards.scss @@ -89,7 +89,7 @@ .card-title { display: block; - font-size: $h4-font-size; + font-size: $h3-font-size; font-weight: 500; margin: 0 0 1.5rem; line-height: 1; -- GitLab