aboutsummaryrefslogtreecommitdiff
path: root/less/navs.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-10-29 22:01:58 -0700
committerMark Otto <[email protected]>2012-10-29 22:01:58 -0700
commitb5af762ef59e1fa97f4386f5feadb67aa5183fef (patch)
tree3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /less/navs.less
parent7426ced0fb288a9e86f18da1849ad74f652d219a (diff)
parent68cfedb34af198f178128f8c9bc8ea164e44304a (diff)
downloadbootstrap-2.2.0.tar.xz
bootstrap-2.2.0.zip
Merge branch '2.1.2-wip'v2.2.0
Conflicts: js/bootstrap-dropdown.js
Diffstat (limited to 'less/navs.less')
-rw-r--r--less/navs.less5
1 files changed, 3 insertions, 2 deletions
diff --git a/less/navs.less b/less/navs.less
index 4c38f7dbf..1944f8441 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -67,7 +67,8 @@
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: @linkColor;
}
-.nav-list [class^="icon-"] {
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
margin-right: 2px;
}
// Dividers (basically an hr) within the dropdown
@@ -123,7 +124,7 @@
.nav-tabs > .active > a,
.nav-tabs > .active > a:hover {
color: @gray;
- background-color: @white;
+ background-color: @bodyBackground;
border: 1px solid #ddd;
border-bottom-color: transparent;
cursor: default;