diff options
| author | Mark Otto <[email protected]> | 2012-01-14 17:16:46 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-14 17:16:46 -0800 |
| commit | 2c3365f99ef81e53d90593c45d10ebeb3426dea9 (patch) | |
| tree | b8612c77ab54f97404a57f21541e4897b56cc019 /bootstrap.css | |
| parent | 74c0fc17c826d3a16c1b3e45b71138c048f7d630 (diff) | |
| download | bootstrap-2c3365f99ef81e53d90593c45d10ebeb3426dea9.tar.xz bootstrap-2c3365f99ef81e53d90593c45d10ebeb3426dea9.zip | |
allow btn-groups to work in navbars
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 9 |
1 files changed, 6 insertions, 3 deletions
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 { |