mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 00:24:03 +02:00
Code Issues Releases Wiki Activity

ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous

Browse Source
This commit is contained in:
Mark Otto
2012-04-14 23:06:00 -07:00
parent 8dc1a0eade
commit a6f27ebed4
3 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

48
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -622,28 +622,28 @@
padding-right: 10px; padding-right: 10px;
margin: 0 0 0 -5px; margin: 0 0 0 -5px;
} }
.navbar .nav-collapse { .nav-collapse {
clear: both; clear: both;
} }
.navbar .nav-collapse .nav { .nav-collapse .nav {
float: none; float: none;
margin: 0 0 9px; margin: 0 0 9px;
} }
.navbar .nav-collapse .nav > li { .nav-collapse .nav > li {
float: none; float: none;
} }
.navbar .nav-collapse .nav > li > a { .nav-collapse .nav > li > a {
margin-bottom: 2px; margin-bottom: 2px;
} }
.navbar .nav-collapse .nav > .divider-vertical { .nav-collapse .nav > .divider-vertical {
display: none; display: none;
} }
.navbar .nav-collapse .nav .nav-header { .nav-collapse .nav .nav-header {
color: #999999; color: #999999;
text-shadow: none; text-shadow: none;
} }
.navbar .nav-collapse .nav > li > a, .nav-collapse .nav > li > a,
.navbar .nav-collapse .dropdown-menu a { .nav-collapse .dropdown-menu a {
padding: 6px 15px; padding: 6px 15px;
font-weight: bold; font-weight: bold;
color: #999999; color: #999999;
@@ -651,25 +651,25 @@
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.navbar .nav-collapse .btn { .nav-collapse .btn {
padding: 4px 10px 4px; padding: 4px 10px 4px;
font-weight: normal; font-weight: normal;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
} }
.navbar .nav-collapse .dropdown-menu li + li a { .nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px; margin-bottom: 2px;
} }
.navbar .nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:hover,
.navbar .nav-collapse .dropdown-menu a:hover { .nav-collapse .dropdown-menu a:hover {
background-color: #222222; background-color: #222222;
} }
.navbar .nav-collapse.in .btn-group { .nav-collapse.in .btn-group {
margin-top: 5px; margin-top: 5px;
padding: 0; padding: 0;
} }
.navbar .nav-collapse .dropdown-menu { .nav-collapse .dropdown-menu {
position: static; position: static;
top: auto; top: auto;
left: auto; left: auto;
@@ -687,11 +687,11 @@
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.navbar .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:before,
.navbar .nav-collapse .dropdown-menu:after { .nav-collapse .dropdown-menu:after {
display: none; display: none;
} }
.navbar .nav-collapse .dropdown-menu .divider { .nav-collapse .dropdown-menu .divider {
display: none; display: none;
} }
.nav-collapse .navbar-form, .nav-collapse .navbar-form,
@@ -709,18 +709,18 @@
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
.navbar .btn-navbar {
display: block;
}
.nav-collapse, .nav-collapse,
.nav-collapse.collapse { .nav-collapse.collapse {
overflow: hidden; overflow: hidden;
height: 0; height: 0;
} }
.navbar .btn-navbar {
display: block;
}
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
} }
@media (min-width: 980px) { @media (min-width: 980px) {
.nav-collapse.collapse { .nav-collapse.collapse {

55
less/responsive-navbar.less
View File

@@ -26,56 +26,59 @@
padding-right: 10px; padding-right: 10px;
margin: 0 0 0 -5px; margin: 0 0 0 -5px;
} }
// COLLAPSIBLE NAVBAR
// ------------------
// Nav collapse clears brand // Nav collapse clears brand
.navbar .nav-collapse { .nav-collapse {
clear: both; clear: both;
} }
// Block-level the nav // Block-level the nav
.navbar .nav-collapse .nav { .nav-collapse .nav {
float: none; float: none;
margin: 0 0 (@baseLineHeight / 2); margin: 0 0 (@baseLineHeight / 2);
} }
.navbar .nav-collapse .nav > li { .nav-collapse .nav > li {
float: none; float: none;
} }
.navbar .nav-collapse .nav > li > a { .nav-collapse .nav > li > a {
margin-bottom: 2px; margin-bottom: 2px;
} }
.navbar .nav-collapse .nav > .divider-vertical { .nav-collapse .nav > .divider-vertical {
display: none; display: none;
} }
.navbar .nav-collapse .nav .nav-header { .nav-collapse .nav .nav-header {
color: @navbarText; color: @navbarText;
text-shadow: none; text-shadow: none;
} }
// Nav and dropdown links in navbar // Nav and dropdown links in navbar
.navbar .nav-collapse .nav > li > a, .nav-collapse .nav > li > a,
.navbar .nav-collapse .dropdown-menu a { .nav-collapse .dropdown-menu a {
padding: 6px 15px; padding: 6px 15px;
font-weight: bold; font-weight: bold;
color: @navbarLinkColor; color: @navbarLinkColor;
.border-radius(3px); .border-radius(3px);
} }
// Buttons // Buttons
.navbar .nav-collapse .btn { .nav-collapse .btn {
padding: 4px 10px 4px; padding: 4px 10px 4px;
font-weight: normal; font-weight: normal;
.border-radius(4px); .border-radius(4px);
} }
.navbar .nav-collapse .dropdown-menu li + li a { .nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px; margin-bottom: 2px;
} }
.navbar .nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:hover,
.navbar .nav-collapse .dropdown-menu a:hover { .nav-collapse .dropdown-menu a:hover {
background-color: @navbarBackground; background-color: @navbarBackground;
} }
// Buttons in the navbar // Buttons in the navbar
.navbar .nav-collapse.in .btn-group { .nav-collapse.in .btn-group {
margin-top: 5px; margin-top: 5px;
padding: 0; padding: 0;
} }
// Dropdowns in the navbar // Dropdowns in the navbar
.navbar .nav-collapse .dropdown-menu { .nav-collapse .dropdown-menu {
position: static; position: static;
top: auto; top: auto;
left: auto; left: auto;
@@ -89,11 +92,11 @@
.border-radius(0); .border-radius(0);
.box-shadow(none); .box-shadow(none);
} }
.navbar .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:before,
.navbar .nav-collapse .dropdown-menu:after { .nav-collapse .dropdown-menu:after {
display: none; display: none;
} }
.navbar .nav-collapse .dropdown-menu .divider { .nav-collapse .dropdown-menu .divider {
display: none; display: none;
} }
// Forms in navbar // Forms in navbar
@@ -111,20 +114,22 @@
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
// Static navbar // Hide everything in the navbar save .brand and toggle button */
.navbar-static .navbar-inner { .nav-collapse,
padding-left: 10px; .nav-collapse.collapse {
padding-right: 10px; overflow: hidden;
height: 0;
} }
// Navbar button // Navbar button
.navbar .btn-navbar { .navbar .btn-navbar {
display: block; display: block;
} }
// Hide everything in the navbar save .brand and toggle button */ // STATIC NAVBAR
.nav-collapse, .nav-collapse.collapse { // -------------
overflow: hidden; .navbar-static .navbar-inner {
height: 0; padding-left: 10px;
padding-right: 10px;
} }
} }