drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner

1 files changed, 8 insertions, 8 deletions

diff --git a/scss/_forms.scss b/scss/_forms.scss
index d7da46a7a..6f7d7f962 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -11,7 +11,7 @@
   display: block;
   width: 100%;
   // // Make inputs at least the height of their button counterpart (base line-height + padding + border)
-  // height: $input-height-base;
+  // height: $input-height;
   padding: $padding-base-y $padding-base-x;
   font-size: $font-size-base;
   line-height: $line-height-base;
@@ -30,7 +30,7 @@
   // &:not(textarea),
   // &:not(select[size]),
   // &:not(select[multiple]) {
-  //   height: $input-height-base;
+  //   height: $input-height;
   // }
 
   // Unstyle the caret on `<select>`s in IE10+.
@@ -103,7 +103,7 @@
   input[type="datetime-local"],
   input[type="month"] {
     &.form-control {
-      line-height: $input-height-base;
+      line-height: $input-height;
     }
 
     &.input-sm,
@@ -125,7 +125,7 @@
 // horizontal form layout.
 
 .form-control-static {
-  min-height: $input-height-base;
+  min-height: $input-height;
   // Size it appropriately next to real form controls
   padding-top: ($padding-base-y + $border-width);
   padding-bottom: ($padding-base-y + $border-width);
@@ -273,7 +273,7 @@ input[type="checkbox"] {
 
   // Ensure icons don't overlap text
   .form-control {
-    padding-right: ($input-height-base * 1.25);
+    padding-right: ($input-height * 1.25);
   }
 }
 // Feedback icon
@@ -283,9 +283,9 @@ input[type="checkbox"] {
   right: 0;
   z-index: 2; // Ensure icon is above input groups
   display: block;
-  width: $input-height-base;
-  height: $input-height-base;
-  line-height: $input-height-base;
+  width: $input-height;
+  height: $input-height;
+  line-height: $input-height;
   text-align: center;
   pointer-events: none;
 }