rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Martijn Cuppens 2019-08-22 10:14:42 +02:00 committed by XhmikosR
parent 4db520bedb
commit bed2a5edab
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_reboot.scss
View File

@ -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 {
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;
} }
} }

2
scss/_type.scss
View File

@ -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;
} }

12
scss/_variables.scss
View File

@ -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;
// 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;
// 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;
// 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;