diff options
| author | Mark Otto <[email protected]> | 2016-10-16 19:42:02 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-16 19:42:02 -0700 |
| commit | 5b7ec495e37f0a1efa83375572cf0ceb3d735da8 (patch) | |
| tree | 07144656e0e5abaf058c8a2dc02c07bf42f7af73 | |
| parent | daf783f781bd07dc04bbf6bb95485a31df741335 (diff) | |
| parent | 227f066650a4cec4a26cbffe162b784d1cbe19de (diff) | |
| download | bootstrap-5b7ec495e37f0a1efa83375572cf0ceb3d735da8.tar.xz bootstrap-5b7ec495e37f0a1efa83375572cf0ceb3d735da8.zip | |
Merge pull request #20918 from twbs/revert-20867-dedupe-sm-vars
Revert "Drop the $small-font-size variable for the newer $font-size-sm one"
| -rw-r--r-- | scss/_type.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index e0be5193c..ff7114074 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -60,7 +60,7 @@ hr { small, .small { - font-size: $font-size-sm; + font-size: $small-font-size; font-weight: normal; } diff --git a/scss/_variables.scss b/scss/_variables.scss index ed0dee39f..c1bcbdc2c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -205,6 +205,8 @@ $headings-color: inherit !default; $lead-font-size: 1.25rem !default; $lead-font-weight: 300 !default; +$small-font-size: 80% !default; + $text-muted: $gray-light !default; $abbr-border-color: $gray-light !default; |