From: Chris Rebert <code@chrisrebert.com>
Date: Thu, 14 Jan 2016 00:16:14 +0000 (-0800)
Subject: Use proper units when adding/subtracting lengths
X-Git-Tag: v4.0.0-alpha.3~371^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4745dd7a1b51a47adcfe2dfb2dcd4beca476c28;p=thirdparty%2Fbootstrap.git

Use proper units when adding/subtracting lengths

[skip sauce]
[skip validator]
---

diff --git a/scss/_alert.scss b/scss/_alert.scss
index b9f6c60dad..b3dcf03210 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 cb478d76a1..4042dc8357 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;