From 36e7660383a7639f5d538efb7dc0f349e285b42d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 7 Jan 2012 00:26:58 -0800
Subject: fix forms in navbars, fix examples' navbars

---
 bootstrap.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bootstrap.css')

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;
-- 
cgit v1.2.3