mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-25 14:30:46 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Otto
2012-07-09 21:01:29 -07:00
parent 413c05a09d
commit f495a8d0cc
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/assets/css/bootstrap.css vendored
View File

@@ -3851,7 +3851,7 @@ input[type="submit"].btn.btn-mini {
.navbar .btn, .navbar .btn,
.navbar .btn-group { .navbar .btn-group {
margin-top: 5px; margin-top: 6px;
} }
.navbar .btn-group .btn { .navbar .btn-group .btn {
@@ -3878,11 +3878,12 @@ input[type="submit"].btn.btn-mini {
.navbar-form select, .navbar-form select,
.navbar-form .radio, .navbar-form .radio,
.navbar-form .checkbox { .navbar-form .checkbox {
margin-top: 5px; margin-top: 6px;
} }
.navbar-form input, .navbar-form input,
.navbar-form select { .navbar-form select,
.navbar-form .btn {
display: inline-block; display: inline-block;
margin-bottom: 0; margin-bottom: 0;
} }

7
less/navbar.less
View File

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

4
less/scaffolding.less
View File

@@ -4,7 +4,7 @@
// Body reset // Body reset
// ---------- // -------------------------
body { body {
margin: 0; margin: 0;
@@ -17,7 +17,7 @@ body {
// Links // Links
// ----- // -------------------------
a { a {
color: @linkColor; color: @linkColor;