From: Mark Otto <markdotto@gmail.com>
Date: Wed, 16 Sep 2015 04:11:15 +0000 (-0700)
Subject: fixes border-width issues when customizing font-size by using 1px instead of .0625rem... 
X-Git-Tag: v4.0.0-alpha.2~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85f08df3b0b3c9b8c0cf625475a4ec66a809d968;p=thirdparty%2Fbootstrap.git

fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 7879f63843..df28863389 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -76,7 +76,7 @@
 // For use with horizontal and inline forms, when you need the label text to
 // align with the form controls.
 .form-control-label {
-  padding: ($input-padding-y + $border-width) $input-padding-x;
+  padding: $input-padding-y $input-padding-x;
   margin-bottom: 0; // Override the `<label>` default
 }
 
@@ -120,8 +120,8 @@
 .form-control-static {
   min-height: $input-height;
   // Size it appropriately next to real form controls
-  padding-top: ($input-padding-y + $border-width);
-  padding-bottom: ($input-padding-y + $border-width);
+  padding-top: $input-padding-y;
+  padding-bottom: $input-padding-y;
   // Remove default margin from `p`
   margin-bottom: 0;
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index b54308e977..471c88f345 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -60,7 +60,7 @@ $enable-grid-classes:       true !default;
 $spacer:                     1rem !default;
 $spacer-x:                   $spacer !default;
 $spacer-y:                   $spacer !default;
-$border-width:               .0625rem !default;
+$border-width:               1px !default;
 
 
 // Body
@@ -283,9 +283,9 @@ $input-padding-y-sm:             .275rem !default;
 $input-padding-x-lg:             1.25rem !default;
 $input-padding-y-lg:             .75rem !default;
 
-$input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) !default;
-$input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default;
-$input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default;
+$input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2)) !default;
+$input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
+$input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
 
 $form-group-margin-bottom:       $spacer-y !default;