diff options
| author | Mark Otto <[email protected]> | 2016-10-09 15:00:11 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-09 15:00:11 -0700 |
| commit | 3b13f811264653c2c767fe9e3bd3fff3794037fb (patch) | |
| tree | 4b43a350411389cb14e778fcba7e1991025af3fe | |
| parent | b4d8367dbc7b801c61b63ccb76a826bc41a7424c (diff) | |
| parent | 8f6a47303a3b52002e4519679db1bfb4b0a449de (diff) | |
| download | bootstrap-3b13f811264653c2c767fe9e3bd3fff3794037fb.tar.xz bootstrap-3b13f811264653c2c767fe9e3bd3fff3794037fb.zip | |
Merge pull request #20867 from twbs/dedupe-sm-vars
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, 1 insertions, 3 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index ff7114074..e0be5193c 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -60,7 +60,7 @@ hr { small, .small { - font-size: $small-font-size; + font-size: $font-size-sm; font-weight: normal; } diff --git a/scss/_variables.scss b/scss/_variables.scss index c7de511f6..d375f91c5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -205,8 +205,6 @@ $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; |