mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form
This commit is contained in:
parent
413c05a09d
commit
f495a8d0cc
7
docs/assets/css/bootstrap.css
vendored
7
docs/assets/css/bootstrap.css
vendored
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
|
||||
// Body reset
|
||||
// ----------
|
||||
// -------------------------
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
@ -17,7 +17,7 @@ body {
|
||||
|
||||
|
||||
// Links
|
||||
// -----
|
||||
// -------------------------
|
||||
|
||||
a {
|
||||
color: @linkColor;
|
||||
|
Loading…
x
Reference in New Issue
Block a user