fix forms in navbars, fix examples' navbars

This commit is contained in:
Mark Otto 2012-01-07 00:26:58 -08:00
parent 94b825abc8
commit 36e7660383
9 changed files with 36 additions and 24 deletions

7
bootstrap.css vendored
View file

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 6 23:58:33 PST 2012
* Date: Sat Jan 7 00:24:46 PST 2012
*/
html, body {
margin: 0;
@ -627,6 +627,7 @@ textarea {
}
.radio.inline, .checkbox.inline {
display: inline-block;
margin-bottom: 0;
}
.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
margin-left: 10px;
@ -1681,6 +1682,10 @@ i {
.navbar-form {
margin-bottom: 0;
}
.navbar-form input, .navbar-form select {
display: inline-block;
margin-bottom: 0;
}
.navbar-search {
position: relative;
float: left;