From 910f3ec4989a22cf93a14c679556ae35e4f29244 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sun, 4 Sep 2016 17:41:38 -0700
Subject: [PATCH] fixes #20485: use rem units in alert dismiss (#20625)

---
 scss/_alert.scss     | 6 +++---
 scss/_variables.scss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scss/_alert.scss b/scss/_alert.scss
index 55fc101dc2..4331771018 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -26,13 +26,13 @@
 // Expand the right padding and account for the close button's positioning.
 
 .alert-dismissible {
-  padding-right: ($alert-padding + 20px);
+  padding-right: ($alert-padding * 2);
 
   // Adjust close link position
   .close {
     position: relative;
-    top: -2px;
-    right: -21px;
+    top: -.125rem;
+    right: -$alert-padding;
     color: inherit;
   }
 }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index da9f5ef5bf..05c008820d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -685,7 +685,7 @@ $modal-sm:                    300px !default;
 //
 // Define alert colors, border radius, and padding.
 
-$alert-padding:               15px !default;
+$alert-padding:               1rem !default;
 $alert-border-radius:         $border-radius !default;
 $alert-link-font-weight:      bold !default;
 $alert-border-width:          $border-width !default;