diff options
| author | Mark Otto <[email protected]> | 2017-01-03 13:51:06 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-01-03 19:32:57 -0800 |
| commit | 0ffd369afdfa064b3a56078ac4351aae01a8c6cf (patch) | |
| tree | 79d6a8bcd7919ccc9fb1412d1985d1bce37343d2 | |
| parent | 57d3a25fec7269fbb3795f320d73460135f39f5e (diff) | |
| download | bootstrap-0ffd369afdfa064b3a56078ac4351aae01a8c6cf.tar.xz bootstrap-0ffd369afdfa064b3a56078ac4351aae01a8c6cf.zip | |
clarify usage of base font-size so we know what's up
| -rw-r--r-- | scss/_close.scss | 2 | ||||
| -rw-r--r-- | scss/_dropdown.scss | 2 | ||||
| -rw-r--r-- | scss/_input-group.scss | 2 | ||||
| -rw-r--r-- | scss/_popover.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/scss/_close.scss b/scss/_close.scss index 5a92430a4..859990e31 100644 --- a/scss/_close.scss +++ b/scss/_close.scss @@ -1,6 +1,6 @@ .close { float: right; - font-size: ($font-size-base * 1.5); + font-size: $close-font-size; font-weight: $close-font-weight; line-height: 1; color: $close-color; diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 1c9c4f235..1c2741a2e 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -44,7 +44,7 @@ min-width: $dropdown-min-width; padding: $dropdown-padding-y 0; margin: $dropdown-margin-top 0 0; // override default ul - font-size: $font-size-base; + font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues color: $body-color; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) list-style: none; diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 29831ab96..ab44883bd 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -69,7 +69,7 @@ .input-group-addon { padding: $input-padding-y $input-padding-x; margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom - font-size: $font-size-base; + font-size: $font-size-base; // Match inputs font-weight: $font-weight-normal; line-height: $input-line-height; color: $input-color; diff --git a/scss/_popover.scss b/scss/_popover.scss index 730f7b5d3..1b6363405 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -130,7 +130,7 @@ // Offset the popover to account for the popover arrow .popover-title { padding: $popover-title-padding-y $popover-title-padding-x; - margin: 0; // reset heading margin + margin-bottom: 0; // Reset the default from Reboot font-size: $font-size-base; background-color: $popover-title-bg; border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); diff --git a/scss/_variables.scss b/scss/_variables.scss index e16a548d5..36dc429c8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -938,6 +938,7 @@ $carousel-transition: transform .6s ease-in-out !default; // Close +$close-font-size: $font-size-base * 1.5 !default; $close-font-weight: $font-weight-bold !default; $close-color: $black !default; $close-text-shadow: 0 1px 0 $white !default; |