mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-30 15:24:08 +03:00
fix up dropdowns and navbar docs for the new dropdown styles
This commit is contained in:
Mark Otto
Vendored
+85
-166
@@ -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 7 20:25:41 PST 2012
|
||||
* Date: Sat Jan 7 20:56:31 PST 2012
|
||||
*/
|
||||
html, body {
|
||||
margin: 0;
|
||||
@@ -1441,7 +1441,7 @@ i {
|
||||
margin-top: 8px;
|
||||
margin-left: 2px;
|
||||
}
|
||||
.dropdown:hover .caret {
|
||||
.dropdown:hover .caret, .open.dropdown .caret {
|
||||
filter: alpha(opacity=100);
|
||||
-moz-opacity: 1;
|
||||
opacity: 1;
|
||||
@@ -1709,7 +1709,88 @@ i {
|
||||
display: block;
|
||||
float: left;
|
||||
margin: 0 10px 0 0;
|
||||
/* // Dropdowns within the .nav
|
||||
}
|
||||
.navbar .nav.pull-right {
|
||||
float: right;
|
||||
}
|
||||
.navbar .nav > li {
|
||||
display: block;
|
||||
float: left;
|
||||
}
|
||||
.navbar .nav > li > a {
|
||||
float: none;
|
||||
padding: 10px 10px 11px;
|
||||
line-height: 19px;
|
||||
color: #999999;
|
||||
text-decoration: none;
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.navbar .nav > li > a:hover {
|
||||
background-color: transparent;
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
}
|
||||
.navbar .nav .active > a {
|
||||
background-color: #222;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.navbar .vertical-divider {
|
||||
height: 40px;
|
||||
width: 1px;
|
||||
margin: 0 5px;
|
||||
overflow: hidden;
|
||||
background-color: #222;
|
||||
border-right: 1px solid #444;
|
||||
}
|
||||
.navbar .nav.pull-right {
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
.navbar .dropdown-menu {
|
||||
top: 42px;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.navbar .dropdown-menu:before {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
border-left: 7px solid transparent;
|
||||
border-right: 7px solid transparent;
|
||||
border-bottom: 7px solid #ccc;
|
||||
border-bottom-color: rgba(0, 0, 0, 0.1);
|
||||
position: absolute;
|
||||
top: -7px;
|
||||
left: 12px;
|
||||
}
|
||||
.navbar .dropdown-menu:after {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
border-left: 6px solid transparent;
|
||||
border-right: 6px solid transparent;
|
||||
border-bottom: 6px solid #fff;
|
||||
position: absolute;
|
||||
top: -6px;
|
||||
left: 13px;
|
||||
}
|
||||
.navbar .dropdown-toggle .caret, .navbar .open.dropdown .caret {
|
||||
border-top-color: #fff;
|
||||
}
|
||||
.navbar .open .dropdown-toggle {
|
||||
background-color: transparent;
|
||||
}
|
||||
.navbar .nav.pull-right .dropdown-menu {
|
||||
right: 0;
|
||||
}
|
||||
.navbar .nav.pull-right .dropdown-menu:before {
|
||||
left: auto;
|
||||
right: 12px;
|
||||
}
|
||||
.navbar .nav.pull-right .dropdown-menu:after {
|
||||
left: auto;
|
||||
right: 13px;
|
||||
}
|
||||
/* // Dropdowns within the .nav
|
||||
.dropdown-toggle:hover,
|
||||
.dropdown.open .dropdown-toggle {
|
||||
background: #444;
|
||||
@@ -1741,45 +1822,6 @@ i {
|
||||
border-color: #444;
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
.navbar .nav > li {
|
||||
display: block;
|
||||
float: left;
|
||||
}
|
||||
.navbar .nav a {
|
||||
float: none;
|
||||
padding: 10px 10px 11px;
|
||||
line-height: 19px;
|
||||
color: #999999;
|
||||
text-decoration: none;
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.navbar .nav a:hover {
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
}
|
||||
.navbar .nav .active > a {
|
||||
background-color: #222;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.navbar .nav .vertical-divider {
|
||||
height: 40px;
|
||||
width: 1px;
|
||||
margin: 0 5px;
|
||||
overflow: hidden;
|
||||
background-color: #222;
|
||||
border-right: 1px solid #444;
|
||||
}
|
||||
.navbar .nav.secondary-nav {
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
margin-right: 0;
|
||||
}
|
||||
.navbar .nav.secondary-nav .dropdown-menu {
|
||||
right: 0;
|
||||
border: 0;
|
||||
}
|
||||
.nav {
|
||||
margin-left: 0;
|
||||
margin-bottom: 18px;
|
||||
@@ -2042,130 +2084,7 @@ i {
|
||||
.tab-content > .active, .pill-content > .active {
|
||||
display: block;
|
||||
}
|
||||
.step-nav {
|
||||
position: relative;
|
||||
margin: 0 0 18px;
|
||||
list-style: none;
|
||||
line-height: 30px;
|
||||
text-align: center;
|
||||
background-color: #f5f5f5;
|
||||
-webkit-border-radius: 15px;
|
||||
-moz-border-radius: 15px;
|
||||
border-radius: 15px;
|
||||
}
|
||||
.step-nav li {
|
||||
display: inline;
|
||||
color: #999999;
|
||||
}
|
||||
.step-nav .prev, .step-nav .next {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
}
|
||||
.step-nav .prev {
|
||||
left: 15px;
|
||||
}
|
||||
.step-nav .next {
|
||||
right: 15px;
|
||||
}
|
||||
.step-nav .dot {
|
||||
display: inline-block;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
margin: 0 3px;
|
||||
text-indent: -999em;
|
||||
background-color: #999999;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
|
||||
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.step-nav .dot:hover, .step-nav .active .dot {
|
||||
background-color: #333333;
|
||||
}
|
||||
.subnav {
|
||||
background-color: #eeeeee;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));
|
||||
background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
|
||||
background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));
|
||||
background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
|
||||
background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
|
||||
background-image: linear-gradient(top, #f5f5f5, #eeeeee);
|
||||
background-repeat: repeat-x;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);
|
||||
-webkit-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5);
|
||||
box-shadow: inset 0 1px 0 #ffffff, 0 0 5px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
.subnav a {
|
||||
padding: 8px 10px;
|
||||
font-size: 12px;
|
||||
color: #0088cc;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
border-left: 1px solid #f9f9f9;
|
||||
border-right: 1px solid #e5e5e5;
|
||||
}
|
||||
.subnav a:hover {
|
||||
color: #005580;
|
||||
background-color: #eee;
|
||||
}
|
||||
.subnav li:first-child a {
|
||||
border-left: 0;
|
||||
-webkit-border-radius: 6px 0 0 6px;
|
||||
-moz-border-radius: 6px 0 0 6px;
|
||||
border-radius: 6px 0 0 6px;
|
||||
}
|
||||
.subnav li:last-child a {
|
||||
border-right: 0;
|
||||
-webkit-border-radius: 0 6px 6px 0;
|
||||
-moz-border-radius: 0 6px 6px 0;
|
||||
border-radius: 0 6px 6px 0;
|
||||
}
|
||||
.subnav ul .active > a {
|
||||
color: #333333;
|
||||
background-color: #eee;
|
||||
}
|
||||
/*.side-nav {
|
||||
padding: @baseLineHeight / 2 0;
|
||||
}
|
||||
.side-nav .nav-label,
|
||||
.side-nav .nav-item {
|
||||
display: block;
|
||||
padding: 3px 15px;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.5);
|
||||
}
|
||||
.side-nav .nav-label {
|
||||
font-size: 11px;
|
||||
line-height: @baseLineHeight;
|
||||
color: @grayLight;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.side-nav .nav-group {
|
||||
margin: 0; // clear default ul margins
|
||||
list-style: none;
|
||||
}
|
||||
.side-nav .nav-group + .nav-label {
|
||||
margin-top: 9px;
|
||||
}
|
||||
|
||||
.side-nav .nav-item {
|
||||
font-weight: bold;
|
||||
}
|
||||
.side-nav .nav-item i {
|
||||
vertical-align: -2px;
|
||||
}
|
||||
.side-nav .nav-item:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
.side-nav .active .nav-item {
|
||||
color: #fff;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.3);
|
||||
#gradient > .vertical(#ccc, #999);
|
||||
@shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05);
|
||||
.box-shadow(@shadow);
|
||||
}*/.breadcrumb {
|
||||
.breadcrumb {
|
||||
padding: 7px 14px;
|
||||
margin: 0 0 18px;
|
||||
background-color: #f5f5f5;
|
||||
|
||||
Reference in New Issue
Block a user