mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity

Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-04-14 22:43:26 -07:00
parent 490eb1bd16 5b85ed181a
commit 8dc1a0eade
7 changed files with 202 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap-responsive.css
Vendored
+30 -19
View File
@@ -623,27 +623,27 @@
margin: 0 0 0 -5px;
}
.navbar .nav-collapse {
clear: left;
clear: both;
}
.navbar .nav {
.navbar .nav-collapse .nav {
float: none;
margin: 0 0 9px;
}
.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: #999999;
text-shadow: none;
}
.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: #999999;
@@ -651,14 +651,25 @@
-moz-border-radius: 3px;
border-radius: 3px;
}
.navbar .dropdown-menu li + li a {
.navbar .nav-collapse .btn {
padding: 4px 10px 4px;
font-weight: normal;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
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: #222222;
}
.navbar .dropdown-menu {
.navbar .nav-collapse.in .btn-group {
margin-top: 5px;
padding: 0;
}
.navbar .nav-collapse .dropdown-menu {
position: static;
top: auto;
left: auto;
@@ -676,15 +687,15 @@
-moz-box-shadow: none;
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;
}
.navbar-form,
.navbar-search {
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
@@ -694,7 +705,7 @@
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
}
.navbar .nav.pull-right {
.navbar .nav-collapse .nav.pull-right {
float: none;
margin-left: 0;
}
@@ -702,7 +713,7 @@
padding-left: 10px;
padding-right: 10px;
}
.btn-navbar {
.navbar .btn-navbar {
display: block;
}
.nav-collapse,