8000 Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstra… · rusongyu/bootstrap@15c7e73 · GitHub
[go: up one dir, main page]
Skip to content

Commit 15c7e73

Browse files
mdomdo
committed
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts: docs/assets/css/bootstrap.css less/navbar.less
2 parents cb0fed6 + c553290 commit 15c7e73

19 files changed

+126
-6159
lines changed

‎docs/assets/css/bootstrap-responsive.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,15 +1003,19 @@
10031003
margin-bottom: 2px;
10041004
}
10051005
.nav-collapse .nav > li > a:hover,
1006-
.nav-collapse .dropdown-menu a:hover {
1006+
.nav-collapse .nav > li > a:focus,
1007+
.nav-collapse .dropdown-menu a:hover,
1008+
.nav-collapse .dropdown-menu a:focus {
10071009
background-color: #f2f2f2;
10081010
}
10091011
.navbar-inverse .nav-collapse .nav > li > a,
10101012
.navbar-inverse .nav-collapse .dropdown-menu a {
10111013
color: #999999;
10121014
}
10131015
.navbar-inverse .nav-collapse .nav > li > a:hover,
1014-
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
1016+
.navbar-inverse .nav-collapse .nav > li > a:focus,
1017+
.navbar-inverse .nav-collapse .dropdown-menu a:hover,
1018+
.navbar-inverse .nav-collapse .dropdown-menu a:focus {
10151019
background-color: #111111;
10161020
}
10171021
.nav-collapse.in .btn-group {

0 commit comments

Comments
 (0)
0