From 296c99020c0f7c8122b8cd1a7f93c0797f8ff8dd Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Tue, 28 Mar 2017 09:28:27 -0700
Subject: Revamp button and input vars while fixing #21587 (#22287)

---
 scss/_input-group.scss | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'scss/_input-group.scss')

diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 49cdf2830..0b668bff3 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -66,11 +66,11 @@
 //
 
 .input-group-addon {
-  padding: $input-padding-y $input-padding-x;
+  padding: $input-btn-padding-y $input-btn-padding-x;
   margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
   font-size: $font-size-base; // Match inputs
   font-weight: $font-weight-normal;
-  line-height: $input-line-height;
+  line-height: $input-btn-line-height;
   color: $input-color;
   text-align: center;
   background-color: $input-group-addon-bg;
@@ -79,12 +79,13 @@
 
   // Sizing
   &.form-control-sm {
-    padding: $input-padding-y-sm $input-padding-x-sm;
+    padding: $input-btn-padding-y-sm $input-btn-padding-x-sm;
     font-size: $font-size-sm;
     @include border-radius($input-border-radius-sm);
   }
+
   &.form-control-lg {
-    padding: $input-padding-y-lg $input-padding-x-lg;
+    padding: $input-btn-padding-y-lg $input-btn-padding-x-lg;
     font-size: $font-size-lg;
     @include border-radius($input-border-radius-lg);
   }
-- 
cgit v1.2.3