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

---
 lib/navbar.less | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/navbar.less b/lib/navbar.less
index a3e64cde8..0d01fe524 100644
--- a/lib/navbar.less
+++ b/lib/navbar.less
@@ -45,9 +45,13 @@
     }
   }
   // Buttons in navbar
-  .btn {
+  .btn,
+  .btn-group {
     margin-top: 5px; // make buttons vertically centered in navbar
   }
+  .btn-group .btn {
+    margin-top: 0;
+  }
 }
 
 // Navbar forms
@@ -218,8 +222,8 @@
 }
 
 // Dropdown toggle caret
-.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