aboutsummaryrefslogtreecommitdiff
path: root/less/navs.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-04-14 22:43:26 -0700
committerMark Otto <[email protected]>2012-04-14 22:43:26 -0700
commit8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e (patch)
tree59707fa22f960a7a66151f91311849cae7fa089d /less/navs.less
parent490eb1bd16177f951b7c66c364d2eee6a6288a5d (diff)
parent5b85ed181a75b286ac4e898173da7b65e20e6d8a (diff)
downloadbootstrap-8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e.tar.xz
bootstrap-8dc1a0eadebb68e4e0c4523a32b1cc103e8a6d4e.zip
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'less/navs.less')
-rw-r--r--less/navs.less8
1 files changed, 4 insertions, 4 deletions
diff --git a/less/navs.less b/less/navs.less
index a0cdad64a..5cb9f9f3a 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -234,14 +234,14 @@
// -------------------------
.nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
-.nav > .open.active > a:hover {
+.nav > li.dropdown.open.active > a:hover {
color: @white;
background-color: @grayLight;
border-color: @grayLight;
}
-.nav .open .caret,
-.nav .open.active .caret,
-.nav .open a:hover .caret {
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret {
border-top-color: @white;
border-bottom-color: @white;
.opacity(100);