mirror of
https://github.com/jasny/bootstrap.git
synced 2026-04-24 03:00:49 -04:00
Navs refactor, restoring .nav-list
This commit is contained in:
Mark Otto
161
docs/assets/css/bootstrap.css
vendored
161
docs/assets/css/bootstrap.css
vendored
@@ -3439,8 +3439,24 @@ input[type="button"].btn-block {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.nav:before,
|
||||
.nav:after {
|
||||
display: table;
|
||||
line-height: 0;
|
||||
content: "";
|
||||
}
|
||||
|
||||
.nav:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.nav > li {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.nav > li > a {
|
||||
display: block;
|
||||
padding: 8px 12px;
|
||||
}
|
||||
|
||||
.nav > li > a:hover {
|
||||
@@ -3475,33 +3491,6 @@ input[type="button"].btn-block {
|
||||
border-bottom: 1px solid #ffffff;
|
||||
}
|
||||
|
||||
.nav-tabs:before,
|
||||
.nav-pills:before,
|
||||
.nav-tabs:after,
|
||||
.nav-pills:after {
|
||||
display: table;
|
||||
line-height: 0;
|
||||
content: "";
|
||||
}
|
||||
|
||||
.nav-tabs:after,
|
||||
.nav-pills:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.nav-tabs > li,
|
||||
.nav-pills > li {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.nav-tabs > li > a,
|
||||
.nav-pills > li > a {
|
||||
padding-right: 12px;
|
||||
padding-left: 12px;
|
||||
margin-right: 2px;
|
||||
line-height: 14px;
|
||||
}
|
||||
|
||||
.nav-tabs {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
@@ -3511,8 +3500,7 @@ input[type="button"].btn-block {
|
||||
}
|
||||
|
||||
.nav-tabs > li > a {
|
||||
padding-top: 8px;
|
||||
padding-bottom: 8px;
|
||||
margin-right: 2px;
|
||||
line-height: 20px;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 4px 4px 0 0;
|
||||
@@ -3531,14 +3519,55 @@ input[type="button"].btn-block {
|
||||
border-bottom-color: transparent;
|
||||
}
|
||||
|
||||
.nav-list {
|
||||
background-color: #fff;
|
||||
border-radius: 6px;
|
||||
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
|
||||
}
|
||||
|
||||
.nav-list > li {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.nav-list > li > a {
|
||||
margin-bottom: -1px;
|
||||
border: 1px solid #e5e5e5;
|
||||
}
|
||||
|
||||
.nav-list > li > a:hover {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
.nav-list > li:first-child > a {
|
||||
border-radius: 6px 6px 0 0;
|
||||
}
|
||||
|
||||
.nav-list > li:last-child > a {
|
||||
border-radius: 0 0 6px 6px;
|
||||
}
|
||||
|
||||
.nav-list > .active > a,
|
||||
.nav-list > .active > a:hover {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
padding: 9px 15px;
|
||||
color: #fff;
|
||||
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15);
|
||||
background-color: #0088cc;
|
||||
border-width: 0;
|
||||
-webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1), inset -1px 0 0 rgba(0, 0, 0, 0.1);
|
||||
box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.1), inset -1px 0 0 rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.nav-pills > li > a {
|
||||
padding-top: 8px;
|
||||
padding-bottom: 8px;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.nav-pills > li + li > a {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
.nav-pills > .active > a,
|
||||
.nav-pills > .active > a:hover {
|
||||
color: #ffffff;
|
||||
@@ -3549,60 +3578,22 @@ input[type="button"].btn-block {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.nav-stacked > li > a {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-stacked {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-stacked > li > a {
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-stacked > li:first-child > a {
|
||||
-webkit-border-top-right-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
-webkit-border-top-left-radius: 4px;
|
||||
border-top-left-radius: 4px;
|
||||
-moz-border-radius-topright: 4px;
|
||||
-moz-border-radius-topleft: 4px;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-stacked > li:last-child > a {
|
||||
-webkit-border-bottom-right-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
-webkit-border-bottom-left-radius: 4px;
|
||||
border-bottom-left-radius: 4px;
|
||||
-moz-border-radius-bottomright: 4px;
|
||||
-moz-border-radius-bottomleft: 4px;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-stacked > li > a:hover {
|
||||
z-index: 2;
|
||||
border-color: #ddd;
|
||||
}
|
||||
|
||||
.nav-pills.nav-stacked > li > a {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
|
||||
.nav-pills.nav-stacked > li:last-child > a {
|
||||
margin-bottom: 1px;
|
||||
.nav-stacked > li + li > a {
|
||||
margin-top: 2px;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.nav-tabs .dropdown-menu {
|
||||
border-radius: 0 0 6px 6px;
|
||||
}
|
||||
|
||||
.nav-pills .dropdown-menu {
|
||||
border-radius: 6px;
|
||||
-webkit-border-top-right-radius: 0;
|
||||
border-top-right-radius: 0;
|
||||
-webkit-border-top-left-radius: 0;
|
||||
border-top-left-radius: 0;
|
||||
-moz-border-radius-topright: 0;
|
||||
-moz-border-radius-topleft: 0;
|
||||
}
|
||||
|
||||
.nav .dropdown-toggle .caret {
|
||||
margin-top: 6px;
|
||||
margin-top: 8px;
|
||||
border-top-color: #0088cc;
|
||||
border-bottom-color: #0088cc;
|
||||
}
|
||||
@@ -3612,12 +3603,6 @@ input[type="button"].btn-block {
|
||||
border-bottom-color: #005580;
|
||||
}
|
||||
|
||||
/* move down carets for tabs */
|
||||
|
||||
.nav-tabs .dropdown-toggle .caret {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.nav .active .dropdown-toggle .caret {
|
||||
border-top-color: #fff;
|
||||
border-bottom-color: #fff;
|
||||
@@ -4071,7 +4056,7 @@ input[type="button"].btn-block {
|
||||
background-image: -o-linear-gradient(top, #222222, #111111);
|
||||
background-image: linear-gradient(to bottom, #222222, #111111);
|
||||
background-repeat: repeat-x;
|
||||
border-color: #252525;
|
||||
border-color: #111111;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user