diff options
| author | Martijn Cuppens <[email protected]> | 2019-08-22 10:14:42 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-08-27 23:11:06 +0300 |
| commit | bed2a5edabcc48956188e5633d10e9105f32d2b3 (patch) | |
| tree | 58ea9d30feedb8e76de4e04dc442d5aaf086261f | |
| parent | 4db520bedb7f67876fb48caff3ac2064a3428bb4 (diff) | |
| download | bootstrap-bed2a5edabcc48956188e5633d10e9105f32d2b3.tar.xz bootstrap-bed2a5edabcc48956188e5633d10e9105f32d2b3.zip | |
Switch percentage `font-size`s to `em` and change some font sizes for consistency
| -rw-r--r-- | scss/_reboot.scss | 4 | ||||
| -rw-r--r-- | scss/_type.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 12 |
3 files changed, 11 insertions, 7 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 34527010a..e0d4f498a 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -213,7 +213,7 @@ small { sub, sup { position: relative; - @include font-size(75%); + @include font-size($sub-sup-font-size); line-height: 0; vertical-align: baseline; } @@ -298,7 +298,7 @@ kbd { kbd { padding: 0; - @include font-size(100%); + @include font-size(1em); font-weight: $nested-kbd-font-weight; } } diff --git a/scss/_type.scss b/scss/_type.scss index 0e266e557..7726b7b21 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -91,7 +91,7 @@ // Builds on `abbr` .initialism { - @include font-size(90%); + @include font-size($initialism-font-size); text-transform: uppercase; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 15559e682..ed2755901 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -332,10 +332,14 @@ $display-line-height: $headings-line-height !default; $lead-font-size: $font-size-base * 1.25 !default; $lead-font-weight: 300 !default; -$small-font-size: 80% !default; +$small-font-size: .875em !default; + +$sub-sup-font-size: .75em !default; $text-muted: $gray-600 !default; +$initialism-font-size: $small-font-size !default; + $blockquote-small-color: $gray-600 !default; $blockquote-small-font-size: $small-font-size !default; $blockquote-font-size: $font-size-base * 1.25 !default; @@ -923,7 +927,7 @@ $toast-header-border-color: rgba(0, 0, 0, .05) !default; // Badges -$badge-font-size: 75% !default; +$badge-font-size: .75em !default; $badge-font-weight: $font-weight-bold !default; $badge-color: $white !default; $badge-padding-y: .25em !default; @@ -1040,7 +1044,7 @@ $thumbnail-box-shadow: $box-shadow-sm !default; // Figures -$figure-caption-font-size: 90% !default; +$figure-caption-font-size: $small-font-size !default; $figure-caption-color: $gray-600 !default; @@ -1108,7 +1112,7 @@ $close-text-shadow: 0 1px 0 $white !default; // Code -$code-font-size: 87.5% !default; +$code-font-size: $small-font-size !default; $code-color: $pink !default; $kbd-padding-y: .2rem !default; |