Permalink
Browse files

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
  • Loading branch information...
2 parents cb0fed6 + c553290 commit 15c7e73abd8d97f0139d177d05c94e26faa17dd2 @mdo mdo committed Feb 6, 2013
@@ -1003,15 +1003,19 @@
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
- .nav-collapse .dropdown-menu a:hover {
+ .nav-collapse .nav > li > a:focus,
+ .nav-collapse .dropdown-menu a:hover,
+ .nav-collapse .dropdown-menu a:focus {
background-color: #f2f2f2;
}
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
color: #999999;
}
.navbar-inverse .nav-collapse .nav > li > a:hover,
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: #111111;
}
.nav-collapse.in .btn-group {
Oops, something went wrong.

0 comments on commit 15c7e73

Please sign in to comment.