mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.

Browse Source
This commit is contained in:
Bryan Petty
2012-04-01 16:22:52 -06:00
parent 7bf4c8e76e
commit 030265eaec
4 changed files with 90 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/responsive-navbar.less
+29 -18
View File
@@ -31,40 +31,51 @@
clear: left;
}
// Block-level the nav
.navbar .nav {
.navbar .nav-collapse .nav {
float: none;
margin: 0 0 (@baseLineHeight / 2);
}
.navbar .nav > li {
.navbar .nav-collapse .nav > li {
float: none;
}
.navbar .nav > li > a {
.navbar .nav-collapse .nav > li > a {
margin-bottom: 2px;
}
.navbar .nav > .divider-vertical {
.navbar .nav-collapse .nav > .divider-vertical {
display: none;
}
.navbar .nav .nav-header {
.navbar .nav-collapse .nav .nav-header {
color: @navbarText;
text-shadow: none;
}
// Nav and dropdown links in navbar
.navbar .nav > li > a,
.navbar .dropdown-menu a {
.navbar .nav-collapse .nav > li > a,
.navbar .nav-collapse .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: @navbarLinkColor;
.border-radius(3px);
}
.navbar .dropdown-menu li + li a {
// Buttons
.navbar .nav-collapse .btn {
padding: 4px 10px 4px;
font-weight: normal;
.border-radius(4px);
}
.navbar .nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover,
.navbar .dropdown-menu a:hover {
.navbar .nav-collapse .nav > li > a:hover,
.navbar .nav-collapse .dropdown-menu a:hover {
background-color: @navbarBackground;
}
// Buttons in the navbar
.navbar .nav-collapse.in .btn-group {
margin-top: 5px;
padding: 0;
}
// Dropdowns in the navbar
.navbar .dropdown-menu {
.navbar .nav-collapse .dropdown-menu {
position: static;
top: auto;
left: auto;
@@ -78,16 +89,16 @@
.border-radius(0);
.box-shadow(none);
}
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
.navbar .nav-collapse .dropdown-menu:before,
.navbar .nav-collapse .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
.navbar .nav-collapse .dropdown-menu .divider {
display: none;
}
// Forms in navbar
.navbar-form,
.navbar-search {
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
padding: (@baseLineHeight / 2) 15px;
margin: (@baseLineHeight / 2) 0;
@@ -96,7 +107,7 @@
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
}
// Pull right (secondary) nav content
.navbar .nav.pull-right {
.navbar .nav-collapse .nav.pull-right {
float: none;
margin-left: 0;
}
@@ -106,7 +117,7 @@
padding-right: 10px;
}
// Navbar button
.btn-navbar {
.navbar .btn-navbar {
display: block;
}