rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #20918 from twbs/revert-20867-dedupe-sm-vars

Browse Source 
Revert "Drop the $small-font-size variable for the newer $font-size-sm one"
This commit is contained in:
Mark Otto 2016-10-16 19:42:02 -07:00 committed by GitHub
commit 5b7ec495e3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_type.scss
View File

@ -60,7 +60,7 @@ hr {
small, small,
.small { .small {
font-size: $font-size-sm; font-size: $small-font-size;
font-weight: normal; font-weight: normal;
} }

2
scss/_variables.scss
View File

@ -205,6 +205,8 @@ $headings-color: inherit !default;
$lead-font-size: 1.25rem !default; $lead-font-size: 1.25rem !default;
$lead-font-weight: 300 !default; $lead-font-weight: 300 !default;
$small-font-size: 80% !default;
$text-muted: $gray-light !default; $text-muted: $gray-light !default;
$abbr-border-color: $gray-light !default; $abbr-border-color: $gray-light !default;