rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
Code Issues Actions Packages Releases Activity

navbars need to use prefixed nav class or they won't work as expected

Browse Source
This commit is contained in:
Mark Otto 2013-12-18 14:28:03 -08:00
parent 3416e87a97
commit ab740f0f0f
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dist/css/bootstrap.css vendored
View File

@ -3762,16 +3762,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
display: none; display: none;
} }
} }
.navbar .nav { .navbar-nav {
margin: 7.5px -15px; margin: 7.5px -15px;
} }
.navbar .nav > li > a { .navbar-nav > li > a {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
line-height: 20px; line-height: 20px;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.navbar .nav .open .dropdown-menu { .navbar-nav .open .dropdown-menu {
position: static; position: static;
float: none; float: none;
width: auto; width: auto;
@ -3780,31 +3780,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
border: 0; border: 0;
box-shadow: none; box-shadow: none;
} }
.navbar .nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu > li > a,
.navbar .nav .open .dropdown-menu .dropdown-header { .navbar-nav .open .dropdown-menu .dropdown-header {
padding: 5px 15px 5px 25px; padding: 5px 15px 5px 25px;
} }
.navbar .nav .open .dropdown-menu > li > a { .navbar-nav .open .dropdown-menu > li > a {
line-height: 20px; line-height: 20px;
} }
.navbar .nav .open .dropdown-menu > li > a:hover, .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar .nav .open .dropdown-menu > li > a:focus { .navbar-nav .open .dropdown-menu > li > a:focus {
background-image: none; background-image: none;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar .nav { .navbar-nav {
float: left; float: left;
margin: 0; margin: 0;
} }
.navbar .nav > li { .navbar-nav > li {
float: left; float: left;
} }
.navbar .nav > li > a { .navbar-nav > li > a {
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
} }
.navbar .nav.navbar-right:last-child { .navbar-nav.navbar-right:last-child {
margin-right: -15px; margin-right: -15px;
} }
} }

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/navbar.less
View File

@ -215,7 +215,7 @@
// Builds on top of the `.nav` components with its own modifier class to make // Builds on top of the `.nav` components with its own modifier class to make
// the nav the full height of the horizontal nav (above 768px). // the nav the full height of the horizontal nav (above 768px).
.navbar .nav { .navbar-nav {
margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal; margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
> li > a { > li > a {