rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

allow .input-prepend/.input-append to work in .navbar per #1681

Browse Source
This commit is contained in:
Mark Otto 2012-02-12 20:28:22 -08:00
parent be6fdd9a62
commit 3e00c1261f
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

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

@ -2530,6 +2530,13 @@ button.btn.small, input[type="submit"].btn.small {
.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
margin-top: 3px; margin-top: 3px;
} }
.navbar-form .input-append, .navbar-form .input-prepend {
margin-top: 6px;
white-space: nowrap;
}
.navbar-form .input-append input, .navbar-form .input-prepend input {
margin-top: 0;
}
.navbar-search { .navbar-search {
position: relative; position: relative;
float: left; float: left;

10
less/navbar.less
View File

@ -81,7 +81,7 @@
margin-top: 5px; // make buttons vertically centered in navbar margin-top: 5px; // make buttons vertically centered in navbar
} }
.btn-group .btn { .btn-group .btn {
margin-top: 0; margin-top: 0; // then undo the margin here so we don't accidentally double it
} }
} }
@ -104,6 +104,14 @@
input[type="radio"] { input[type="radio"] {
margin-top: 3px; margin-top: 3px;
} }
.input-append,
.input-prepend {
margin-top: 6px;
white-space: nowrap; // preven two items from separating within a .navbar-form that has .pull-left
input {
margin-top: 0; // remove the margin on top since it's on the parent
}
}
} }
// Navbar search // Navbar search