diff options
| author | Chris Rebert <[email protected]> | 2016-01-13 18:07:55 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-13 18:07:55 -0800 |
| commit | 6ff249791e3e959b01e1dd0a99ecdf76e68075f5 (patch) | |
| tree | c29d2a3832a638ef7d4685e4cda025e06b113315 | |
| parent | 5e9b365b2533d245bc992caaad2beca4bc3d701e (diff) | |
| parent | a4745dd7a1b51a47adcfe2dfb2dcd4beca476c28 (diff) | |
| download | bootstrap-6ff249791e3e959b01e1dd0a99ecdf76e68075f5.tar.xz bootstrap-6ff249791e3e959b01e1dd0a99ecdf76e68075f5.zip | |
Merge pull request #18882 from twbs/stoichiometry
Use proper units when adding/subtracting lengths
| -rw-r--r-- | scss/_alert.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/_alert.scss b/scss/_alert.scss index b9f6c60da..b3dcf0321 100644 --- a/scss/_alert.scss +++ b/scss/_alert.scss @@ -35,7 +35,7 @@ // Expand the right padding and account for the close button's positioning. .alert-dismissible { - padding-right: ($alert-padding + 20); + padding-right: ($alert-padding + 20px); // Adjust close link position .close { diff --git a/scss/_variables.scss b/scss/_variables.scss index cb478d76a..4042dc835 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -506,7 +506,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default; $popover-arrow-width: 10px !default; $popover-arrow-color: $popover-bg !default; -$popover-arrow-outer-width: ($popover-arrow-width + 1) !default; +$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default; $popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; |