fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align...

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 360461afe50ddef5b882f59b91ad8172713265a7..61da2f457880334e0de066181eb20b3d2b9165f6 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3851,7 +3851,7 @@ input[type="submit"].btn.btn-mini {
 
 .navbar .btn,
 .navbar .btn-group {
-  margin-top: 5px;
+  margin-top: 6px;
 }
 
 .navbar .btn-group .btn {
@@ -3878,11 +3878,12 @@ input[type="submit"].btn.btn-mini {
 .navbar-form select,
 .navbar-form .radio,
 .navbar-form .checkbox {
-  margin-top: 5px;
+  margin-top: 6px;
 }
 
 .navbar-form input,
-.navbar-form select {
+.navbar-form select,
+.navbar-form .btn {
   display: inline-block;
   margin-bottom: 0;
 }

diff --git a/less/navbar.less b/less/navbar.less
index 660838eb8e64e29d521b449a60e798ba9d7e4a92..c58fd83d0c0df728e56b64020af97046d1d734bf 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -72,7 +72,7 @@
   // Buttons in navbar
   .btn,
   .btn-group {
-    .navbarVerticalAlign(30px); // Vertically center in navbar
+    .navbarVerticalAlign(28px); // Vertically center in navbar
   }
   .btn-group .btn {
     margin: 0; // then undo the margin here so we don't accidentally double it
@@ -87,10 +87,11 @@
   select,
   .radio,
   .checkbox {
-    .navbarVerticalAlign(30px); // Vertically center in navbar
+    .navbarVerticalAlign(28px); // Vertically center in navbar
   }
   input,
-  select {
+  select,
+  .btn {
     display: inline-block;
     margin-bottom: 0;
   }

diff --git a/less/scaffolding.less b/less/scaffolding.less
index 5bc90cc16850131cbb41febd91e742415d23121e..a218c547867fd97b40c646afc65b766f3993c7b4 100644 (file)
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -4,7 +4,7 @@
 
 
 // Body reset
-// ----------
+// -------------------------
 
 body {
   margin: 0;
@@ -17,7 +17,7 @@ body {
 
 
 // Links
-// -----
+// -------------------------
 
 a {
   color: @linkColor;