diff options
| author | Mark Otto <[email protected]> | 2011-09-02 00:52:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 00:52:22 -0700 |
| commit | 251882892f27fa074d9f801c651060552a970282 (patch) | |
| tree | 32cf528b0b33d8740c25cf3cafb1be4f515f185c /lib/patterns.less | |
| parent | fa94b264fa9b552427a349235e176543af4be6d1 (diff) | |
| parent | 2a5d829c4a09f82aa9ce4ab8db2025aec91c120b (diff) | |
| download | bootstrap-251882892f27fa074d9f801c651060552a970282.tar.xz bootstrap-251882892f27fa074d9f801c651060552a970282.zip | |
resolve conflicts
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index b1e2cfe05..013566b81 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -95,8 +95,9 @@ } // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present -.topbar-inner, -.topbar .fill { // For backwards compatibility +// For backwards compatability, include .topbar .fill +.topbar-inner, +.topbar .fill { background-color: #222; #gradient > .vertical(#333, #222); @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); @@ -243,6 +244,17 @@ a.menu:after, display: block; background-color: none; } + // Dividers (basically an hr) within the dropdown + .divider { + height: 1px; + margin: 5px 0; + overflow: hidden; + background-color: #eee; + border-bottom: 1px solid #fff; + } +} + +.topbar .dropdown-menu, .dropdown-menu { // Links within the dropdown menu a { display: block; @@ -261,15 +273,8 @@ a.menu:after, .box-shadow(@shadow); } } - // Dividers (basically an hr) within the dropdown - .divider { - height: 1px; - margin: 5px 0; - overflow: hidden; - background-color: #eee; - border-bottom: 1px solid #fff; - } } + // Open state for the dropdown // .open for backwards compatibility .open, |