aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-27 18:28:39 -0700
committerMark Otto <[email protected]>2013-04-27 18:28:39 -0700
commit8b3a1702d443c4a451d02d3482ed2cb4aeff0d44 (patch)
tree997b9e4486bbde405efa4b033cea3a3dd05d35c7 /docs/assets/css/bootstrap.css
parent2ffa0e44094ab67e23fb1642d6b1b8d269d3a2f1 (diff)
downloadbootstrap-8b3a1702d443c4a451d02d3482ed2cb4aeff0d44.tar.xz
bootstrap-8b3a1702d443c4a451d02d3482ed2cb4aeff0d44.zip
Overhaul navbar navs
* Switch from to to eliminate an element in selectors * Drop .navbar-divider entirely
Diffstat (limited to 'docs/assets/css/bootstrap.css')
-rw-r--r--docs/assets/css/bootstrap.css129
1 files changed, 45 insertions, 84 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index be8236ea3..b4a3b5854 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3515,33 +3515,33 @@ button.close {
clear: both;
}
-.navbar .nav {
+.navbar-nav {
margin-top: 15px;
}
-.navbar .nav > li > a {
+.navbar-nav > li > a {
padding-top: 15px;
padding-bottom: 15px;
line-height: 20px;
color: #777777;
}
-.navbar .nav > li > a:hover,
-.navbar .nav > li > a:focus {
+.navbar-nav > li > a:hover,
+.navbar-nav > li > a:focus {
color: #333333;
background-color: transparent;
}
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
+.navbar-nav > .active > a,
+.navbar-nav > .active > a:hover,
+.navbar-nav > .active > a:focus {
color: #555555;
background-color: #d5d5d5;
}
-.navbar .nav > .disabled > a,
-.navbar .nav > .disabled > a:hover,
-.navbar .nav > .disabled > a:focus {
+.navbar-nav > .disabled > a,
+.navbar-nav > .disabled > a:hover,
+.navbar-nav > .disabled > a:focus {
color: #cccccc;
background-color: transparent;
}
@@ -3570,7 +3570,7 @@ button.close {
.navbar-brand {
display: block;
max-width: 200px;
- padding: 7px 15px;
+ padding: 15px;
margin-right: auto;
margin-left: auto;
font-size: 18px;
@@ -3614,57 +3614,49 @@ button.close {
margin-top: 4px;
}
-.navbar .nav > .divider {
- height: 2px;
- margin: 9px 0;
- overflow: hidden;
- background-color: #e1e1e1;
- border-bottom: 1px solid #fbfbfb;
-}
-
.navbar-form {
margin-top: 8px;
margin-bottom: 8px;
}
-.navbar .nav > li > .dropdown-menu {
+.navbar-nav > li > .dropdown-menu {
margin-top: 0;
border-top-right-radius: 0;
border-top-left-radius: 0;
}
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
+.navbar-nav li.dropdown > a:hover .caret,
+.navbar-nav li.dropdown > a:focus .caret {
border-top-color: #333333;
border-bottom-color: #333333;
}
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+.navbar-nav li.dropdown.open > .dropdown-toggle,
+.navbar-nav li.dropdown.active > .dropdown-toggle,
+.navbar-nav li.dropdown.open.active > .dropdown-toggle {
color: #555555;
background-color: #d5d5d5;
}
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
+.navbar-nav li.dropdown > .dropdown-toggle .caret {
border-top-color: #777777;
border-bottom-color: #777777;
}
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+.navbar-nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-nav li.dropdown.open.active > .dropdown-toggle .caret {
border-top-color: #555555;
border-bottom-color: #555555;
}
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
+.navbar-nav.pull-right > li > .dropdown-menu,
+.navbar-nav > li > .dropdown-menu.pull-right {
right: 0;
left: auto;
}
@@ -3687,26 +3679,26 @@ button.close {
color: #999999;
}
-.navbar-inverse .nav > li > a {
+.navbar-inverse .navbar-nav > li > a {
color: #999999;
}
-.navbar-inverse .nav > li > a:hover,
-.navbar-inverse .nav > li > a:focus {
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
color: #ffffff;
background-color: transparent;
}
-.navbar-inverse .nav > .active > a,
-.navbar-inverse .nav > .active > a:hover,
-.navbar-inverse .nav > .active > a:focus {
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
color: #ffffff;
background-color: #080808;
}
-.navbar-inverse .nav > .disabled > a,
-.navbar-inverse .nav > .disabled > a:hover,
-.navbar-inverse .nav > .disabled > a:focus {
+.navbar-inverse .navbar-nav > .disabled > a,
+.navbar-inverse .navbar-nav > .disabled > a:hover,
+.navbar-inverse .navbar-nav > .disabled > a:focus {
color: #444444;
background-color: transparent;
}
@@ -3724,31 +3716,26 @@ button.close {
background-color: #fff;
}
-.navbar-inverse .nav > .divider {
- background-color: #151515;
- border-bottom-color: #2f2f2f;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle {
color: #ffffff;
background-color: #080808;
}
-.navbar-inverse .nav li.dropdown > a:hover .caret {
+.navbar-inverse .navbar-nav li.dropdown > a:hover .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+.navbar-inverse .navbar-nav li.dropdown > .dropdown-toggle .caret {
border-top-color: #999999;
border-bottom-color: #999999;
}
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+.navbar-inverse .navbar-nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .navbar-nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .navbar-nav li.dropdown.open.active > .dropdown-toggle .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
@@ -3760,36 +3747,19 @@ button.close {
}
.navbar-brand {
float: left;
- padding-top: 15px;
- padding-bottom: 15px;
- margin-left: -10px;
+ margin-right: 5px;
+ margin-left: -5px;
}
.navbar .nav {
float: left;
margin-top: 0;
}
- .navbar .nav:before,
- .navbar .nav:after {
- display: table;
- content: " ";
- }
- .navbar .nav:after {
- clear: both;
- }
- .navbar .nav:before,
- .navbar .nav:after {
- display: table;
- content: " ";
- }
- .navbar .nav:after {
- clear: both;
+ .navbar .nav > li {
+ float: left;
}
.navbar .nav.pull-right {
float: right;
}
- .navbar .nav > li {
- float: left;
- }
.navbar .nav > .divider {
width: 1px;
height: 30px;
@@ -3800,15 +3770,6 @@ button.close {
.navbar-inverse .nav > .divider {
border-right-color: #2f2f2f;
}
- .navbar-fixed-left {
- padding-right: 0;
- padding-left: 0;
- }
- .navbar-fixed-left .navbar-brand,
- .navbar-fixed-left .nav,
- .navbar-fixed-left .nav > li {
- float: none;
- }
.navbar-toggle {
position: relative;
top: auto;