mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-14 18:42:30 +03:00
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/getting-started.html docs/templates/pages/getting-started.mustache less/accordion.less less/alerts.less less/breadcrumbs.less less/buttons.less less/code.less less/dropdowns.less less/forms.less less/navbar.less less/progress-bars.less less/responsive-navbar.less less/tables.less less/thumbnails.less less/tooltip.less less/wells.less
This commit is contained in:
@@ -75,7 +75,7 @@
|
||||
.nav-collapse .btn {
|
||||
padding: 4px 10px 4px;
|
||||
font-weight: normal;
|
||||
border-radius: 4px;
|
||||
border-radius: @baseBorderRadius;
|
||||
}
|
||||
.nav-collapse .dropdown-menu li + li a {
|
||||
margin-bottom: 2px;
|
||||
@@ -84,6 +84,10 @@
|
||||
.nav-collapse .dropdown-menu a:hover {
|
||||
background-color: @navbarBackground;
|
||||
}
|
||||
.navbar-inverse .nav-collapse .nav > li > a,
|
||||
.navbar-inverse .nav-collapse .dropdown-menu a {
|
||||
color: @navbarInverseLinkColor;
|
||||
}
|
||||
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
||||
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
|
||||
background-color: @navbarInverseBackground;
|
||||
@@ -99,7 +103,7 @@
|
||||
top: auto;
|
||||
left: auto;
|
||||
float: none;
|
||||
display: block;
|
||||
display: none;
|
||||
max-width: none;
|
||||
margin: 0 15px;
|
||||
padding: 0;
|
||||
@@ -108,6 +112,10 @@
|
||||
border-radius: 0;
|
||||
.box-shadow(none);
|
||||
}
|
||||
.nav-collapse .open > .dropdown-menu {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.nav-collapse .dropdown-menu:before,
|
||||
.nav-collapse .dropdown-menu:after {
|
||||
display: none;
|
||||
|
||||
Reference in New Issue
Block a user