mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

nuke uber footer, bring back topbar dropdowns

Browse Source
This commit is contained in:
Mark Otto
2012-01-12 15:29:16 -08:00
parent ef8b27cdc7
commit 391248c0e3
11 changed files with 502 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.css
Vendored
+18 -22
View File
@@ -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: Thu Jan 12 12:30:32 PST 2012
* Date: Thu Jan 12 15:28:03 PST 2012
*/
html, body {
margin: 0;
@@ -1453,12 +1453,12 @@ i {
min-width: 160px;
max-width: 220px;
_width: 160px;
padding: 5px 0;
padding: 4px 0;
margin: 0;
list-style: none;
background-color: #ffffff;
border-color: #999;
border-color: rgba(0, 0, 0, 0.1);
border-color: rgba(0, 0, 0, 0.2);
border-style: solid;
border-width: 1px;
-webkit-border-radius: 0 0 5px 5px;
@@ -1486,24 +1486,12 @@ i {
font-weight: normal;
line-height: 18px;
color: #555555;
white-space: nowrap;
}
.dropdown-menu li > a:hover {
color: #fff;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #0077b3;
background-image: -khtml-gradient(linear, left top, left bottom, from(#0088cc), to(#0077b3));
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -ms-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #0088cc), color-stop(100%, #0077b3));
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
background-image: linear-gradient(top, #0088cc, #0077b3);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0077b3', GradientType=0);
-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
background-color: #0088cc;
}
.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
color: #fff;
@@ -1747,7 +1735,7 @@ i {
margin-right: 0;
}
.navbar .dropdown-menu {
top: 42px;
top: 41px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
@@ -1758,10 +1746,10 @@ i {
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-bottom-color: rgba(0, 0, 0, 0.1);
border-bottom-color: rgba(0, 0, 0, 0.2);
position: absolute;
top: -7px;
left: 12px;
left: 9px;
}
.navbar .dropdown-menu:after {
content: '';
@@ -1771,14 +1759,22 @@ i {
border-bottom: 6px solid #fff;
position: absolute;
top: -6px;
left: 13px;
left: 10px;
}
.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
border-top-color: #fff;
}
.navbar .open .dropdown-toggle {
.navbar .nav .active .caret {
filter: alpha(opacity=100);
-moz-opacity: 1;
opacity: 1;
}
.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
background-color: transparent;
}
.navbar .nav .active > .dropdown-toggle:hover {
color: #fff;
}
.navbar .nav.pull-right .dropdown-menu {
right: 0;
}