Skip to content
GitLab
Commit bed2a5ed authored by Martijn Cuppens's avatar Martijn Cuppens Committed by XhmikosR
Browse files

Switch percentage `font-size`s to `em` and change some font sizes for consistency

parent 4db520be
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 7 deletions
+11 -7
scss/_reboot.scss
+ 2
- 2
View file @ bed2a5ed
...@@ -213,7 +213,7 @@ small { ...@@ -213,7 +213,7 @@ small {
sub, sub,
sup { sup {
position: relative; position: relative;
@include font-size(75%); @include font-size($sub-sup-font-size);
line-height: 0; line-height: 0;
vertical-align: baseline; vertical-align: baseline;
} }
...@@ -298,7 +298,7 @@ kbd { ...@@ -298,7 +298,7 @@ kbd {
kbd { kbd {
padding: 0; padding: 0;
@include font-size(100%); @include font-size(1em);
font-weight: $nested-kbd-font-weight; font-weight: $nested-kbd-font-weight;
} }
} }
......
scss/_type.scss
+ 1
- 1
View file @ bed2a5ed
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
// Builds on `abbr` // Builds on `abbr`
.initialism { .initialism {
@include font-size(90%); @include font-size($initialism-font-size);
text-transform: uppercase; text-transform: uppercase;
} }
......
scss/_variables.scss
+ 8
- 4
View file @ bed2a5ed
...@@ -332,10 +332,14 @@ $display-line-height: $headings-line-height !default; ...@@ -332,10 +332,14 @@ $display-line-height: $headings-line-height !default;
$lead-font-size: $font-size-base * 1.25 !default; $lead-font-size: $font-size-base * 1.25 !default;
$lead-font-weight: 300 !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; $text-muted: $gray-600 !default;
$initialism-font-size: $small-font-size !default;
$blockquote-small-color: $gray-600 !default; $blockquote-small-color: $gray-600 !default;
$blockquote-small-font-size: $small-font-size !default; $blockquote-small-font-size: $small-font-size !default;
$blockquote-font-size: $font-size-base * 1.25 !default; $blockquote-font-size: $font-size-base * 1.25 !default;
...@@ -923,7 +927,7 @@ $toast-header-border-color: rgba(0, 0, 0, .05) !default; ...@@ -923,7 +927,7 @@ $toast-header-border-color: rgba(0, 0, 0, .05) !default;
// Badges // Badges
$badge-font-size: 75% !default; $badge-font-size: .75em !default;
$badge-font-weight: $font-weight-bold !default; $badge-font-weight: $font-weight-bold !default;
$badge-color: $white !default; $badge-color: $white !default;
$badge-padding-y: .25em !default; $badge-padding-y: .25em !default;
...@@ -1040,7 +1044,7 @@ $thumbnail-box-shadow: $box-shadow-sm !default; ...@@ -1040,7 +1044,7 @@ $thumbnail-box-shadow: $box-shadow-sm !default;
// Figures // Figures
$figure-caption-font-size: 90% !default; $figure-caption-font-size: $small-font-size !default;
$figure-caption-color: $gray-600 !default; $figure-caption-color: $gray-600 !default;
...@@ -1108,7 +1112,7 @@ $close-text-shadow: 0 1px 0 $white !default; ...@@ -1108,7 +1112,7 @@ $close-text-shadow: 0 1px 0 $white !default;
// Code // Code
$code-font-size: 87.5% !default; $code-font-size: $small-font-size !default;
$code-color: $pink !default; $code-color: $pink !default;
$kbd-padding-y: .2rem !default; $kbd-padding-y: .2rem !default;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment