From 2c3365f99ef81e53d90593c45d10ebeb3426dea9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 14 Jan 2012 17:16:46 -0800
Subject: allow btn-groups to work in navbars

---
 bootstrap.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bootstrap.css')

diff --git a/bootstrap.css b/bootstrap.css
index 6bfb8d2da..da68a66a8 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: Sat Jan 14 16:56:39 PST 2012
+ * Date: Sat Jan 14 17:11:53 PST 2012
  */
 html, body {
   margin: 0;
@@ -1611,9 +1611,12 @@ i {
   color: #ffffff;
   background-color: transparent;
 }
-.navbar .btn {
+.navbar .btn, .navbar .btn-group {
   margin-top: 5px;
 }
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
 .navbar-form {
   margin-bottom: 0;
 }
@@ -1758,7 +1761,7 @@ i {
   top: -6px;
   left: 10px;
 }
-.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: #fff;
 }
 .navbar .nav .active .caret {
-- 
cgit v1.2.3