From f495a8d0cc48d1440198e784a8f336a82e3a48bd Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 9 Jul 2012 21:01:29 -0700
Subject: [PATCH] fixes #3210: add .btn to .navbar-form to remove bottom
margin, improve vertical align of contents of .navbar-form
---
docs/assets/css/bootstrap.css | 7 ++++---
less/navbar.less | 7 ++++---
less/scaffolding.less | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 360461afe5..61da2f4578 100644
--- 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 660838eb8e..c58fd83d0c 100644
--- 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 5bc90cc168..a218c54786 100644
--- 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;
--
GitLab