mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +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
lib/dropdowns.less
+4 -6
View File
@@ -36,12 +36,12 @@
min-width: 160px;
max-width: 220px;
_width: 160px;
padding: 5px 0;
padding: 4px 0;
margin: 0; // override default ul
list-style: none;
background-color: @white;
border-color: #999;
border-color: rgba(0,0,0,.1);
border-color: rgba(0,0,0,.2);
border-style: solid;
border-width: 1px;
.border-radius(0 0 5px 5px);
@@ -68,6 +68,7 @@
font-weight: normal;
line-height: 18px;
color: @gray;
white-space: nowrap;
}
}
@@ -75,10 +76,7 @@
.dropdown-menu li > a:hover {
color: #fff;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
#gradient > .vertical(@linkColor, darken(@linkColor, 5%));
@shadow: inset 0 1px 0 rgba(0,0,0,.075), inset 0 -1px rgba(0,0,0,.075);
.box-shadow(@shadow);
background-color: @linkColor;
}
// Active state
lib/navbar.less
+15 -5
View File
@@ -192,7 +192,7 @@
// Menu position and menu carets
.navbar .dropdown-menu {
top: 42px;
top: 41px;
.border-radius(4px);
&:before {
content: '';
@@ -200,10 +200,10 @@
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-bottom-color: rgba(0,0,0,.1);
border-bottom-color: rgba(0,0,0,.2);
position: absolute;
top: -7px;
left: 12px;
left: 9px;
}
&:after {
content: '';
@@ -213,7 +213,7 @@
border-bottom: 6px solid #fff;
position: absolute;
top: -6px;
left: 13px;
left: 10px;
}
}
@@ -222,12 +222,22 @@
.navbar .open.dropdown .caret {
border-top-color: #fff;
}
.navbar .nav .active .caret {
.opacity(100);
}
// Remove background color from open dropdown
.navbar .open .dropdown-toggle {
.navbar .nav .open > .dropdown-toggle,
.navbar .nav .active > .dropdown-toggle,
.navbar .nav .open.active > .dropdown-toggle {
background-color: transparent;
}
// Dropdown link on hover
.navbar .nav .active > .dropdown-toggle:hover {
color: #fff;
}
// Right aligned menus need alt position
.navbar .nav.pull-right .dropdown-menu {
right: 0;