From: Mark Otto <markdotto@gmail.com>
Date: Mon, 22 Jun 2015 23:30:31 +0000 (-0700)
Subject: tweak small forms, small inputs; trying to equalize their rendered dimensions
X-Git-Tag: v4.0.0-alpha~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce9c0f0125ffcebf20d993a70ca2d6348bdd8336;p=thirdparty%2Fbootstrap.git

tweak small forms, small inputs; trying to equalize their rendered dimensions
---

diff --git a/scss/_forms.scss b/scss/_forms.scss
index 7cdf541258..1426fe7938 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -19,7 +19,7 @@
   background-color: $input-bg;
   // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.
   background-image: none;
-  border: 1px solid $input-border;
+  border: $border-width solid $input-border;
    // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS.
   @include border-radius($input-border-radius);
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -27,11 +27,11 @@
 
   // Make inputs at least the height of their button counterpart (base line-height + padding + border).
   // Only apply the height to textual inputs and some selcts.
-  &:not(textarea),
-  &:not(select[size]),
-  &:not(select[multiple]) {
-    height: $input-height-base;
-  }
+  // &:not(textarea),
+  // &:not(select[size]),
+  // &:not(select[multiple]) {
+  //   height: $input-height-base;
+  // }
 
   // Unstyle the caret on `<select>`s in IE10+.
   &::-ms-expand {
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 342c8cc8c1..17836899a2 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -141,9 +141,11 @@
 }
 
 
-// Condensed navbar
+// Small navbar
+//
+// Condensed dimensions for an aesthetic closer to v3's navbar.
 
-.navbar-condensed {
+.navbar-sm {
   padding-top: 0;
   padding-bottom: 0;
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 5b8b1c55ef..7615d2f0c3 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -102,7 +102,7 @@ $padding-base-horizontal:   .75rem !default;
 $padding-lg-vertical:    .75rem !default;
 $padding-lg-horizontal:  1.5rem !default;
 
-$padding-sm-vertical:    .3rem !default;
+$padding-sm-vertical:    .275rem !default;
 $padding-sm-horizontal:  .75rem !default;
 
 $padding-xs-vertical:       .2rem !default;