aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 00:26:58 -0800
committerMark Otto <[email protected]>2012-01-07 00:26:58 -0800
commit36e7660383a7639f5d538efb7dc0f349e285b42d (patch)
treec95ba413d3b56460d6b75da4534a12fa946e7d64 /bootstrap.css
parent94b825abc82abba14131824d57f3368871c5f4cb (diff)
downloadbootstrap-36e7660383a7639f5d538efb7dc0f349e285b42d.tar.xz
bootstrap-36e7660383a7639f5d538efb7dc0f349e285b42d.zip
fix forms in navbars, fix examples' navbars
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css7
1 files changed, 6 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 85ed7961a..f10d872ac 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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;