From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 28 Nov 2016 07:59:21 +0000 (-0800)
Subject: Fix #20013, nullify #21112 (#21230)
X-Git-Tag: v4.0.0-alpha.6~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23866efbb116804390ec8014aa5961e961c6e112;p=thirdparty%2Fbootstrap.git

Fix #20013, nullify #21112 (#21230)

Add padding to dismiss button for alerts and use position to place it. Removes extra padding on .alert-dismissible's right side, too. We could probably further simplify these things in the future as well.
---

diff --git a/scss/_alert.scss b/scss/_alert.scss
index 517762eabe..d9b4e9b276 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -26,13 +26,12 @@
 // Expand the right padding and account for the close button's positioning.
 
 .alert-dismissible {
-  padding-right: ($alert-padding-x * 2);
-
   // Adjust close link position
   .close {
     position: relative;
-    top: -.125rem;
+    top: -$alert-padding-y;
     right: -$alert-padding-x;
+    padding: $alert-padding-y $alert-padding-x;
     color: inherit;
   }
 }