diff options
| author | Mark Otto <[email protected]> | 2011-08-31 16:27:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-31 16:27:28 -0700 |
| commit | 0cb6804b6953d8fce53fcfae065288fd826d1941 (patch) | |
| tree | b6f8a6f2156a0389b74114dcc985ef1e413ed2d7 /lib/patterns.less | |
| parent | 6258832776b113b09e963680ef121b363dd8d292 (diff) | |
| parent | f6a4dd95b62771b105530c85a98901f06bfecdd7 (diff) | |
| download | bootstrap-0cb6804b6953d8fce53fcfae065288fd826d1941.tar.xz bootstrap-0cb6804b6953d8fce53fcfae065288fd826d1941.zip | |
merging in remote and recompiling
Diffstat (limited to 'lib/patterns.less')
| -rw-r--r-- | lib/patterns.less | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 219e26b3f..91294103c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -147,16 +147,16 @@ // Dropdowns within the .nav .dropdown-toggle:hover, .dropdown.open .dropdown-toggle { - background-color: #444; - background-color: rgba(255,255,255,.05); - *background-color: #444; // IE6-7 + background: #444; + background: rgba(255,255,255,.05); } .dropdown-menu { background-color: #333; .dropdown-toggle { color: #fff; &.open { - background-color: rgba(255,255,255,.05); + background: #444; + background: rgba(255,255,255,.05); } } li a { @@ -253,8 +253,8 @@ .dropdown.open { .dropdown-toggle { color: #fff; - background-color: #ccc; - background-color: rgba(0,0,0,.3); + background: #ccc; + background: rgba(0,0,0,.3); } .dropdown-menu { display: block; @@ -283,8 +283,8 @@ border-bottom: 1px solid #ddd; > li { position: relative; // For the dropdowns mostly + top: 1px; > a { - margin-bottom: -1px; margin-right: 2px; padding: 0 15px; line-height: (@baseline * 2) - 1; @@ -743,9 +743,8 @@ input[type=submit].btn { height: 0; } .inner { - background-color: #333; - background-color: rgba(0,0,0,.8); - *background-color: #333; /* IE 6-7 */ + background: #333; + background: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px; |