aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2013-07-06 21:51:47 -0700
committerChris Rebert <[email protected]>2013-07-07 15:31:18 -0700
commit15bd6eadf39c4bbd5ac0971e9d77d26ab85635af (patch)
tree4094b75d805c25b96d423c8543347037492706e6
parent95655e72754b9450d04108593f60647cf2e2241c (diff)
downloadbootstrap-15bd6eadf39c4bbd5ac0971e9d77d26ab85635af.tar.xz
bootstrap-15bd6eadf39c4bbd5ac0971e9d77d26ab85635af.zip
more nesting in navs.less
-rw-r--r--less/navs.less73
1 files changed, 41 insertions, 32 deletions
diff --git a/less/navs.less b/less/navs.less
index d42ad3588..1b1e18ed0 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -31,13 +31,14 @@
// Disabled state sets text to gray and nukes hover/tab effects
&.disabled > a {
color: @gray-light;
- }
- &.disabled > a:hover,
- &.disabled > a:focus {
- color: @gray-light;
- text-decoration: none;
- background-color: transparent;
- cursor: default;
+
+ &:hover,
+ &:focus {
+ color: @gray-light;
+ text-decoration: none;
+ background-color: transparent;
+ cursor: default;
+ }
}
// Space the headers out when they follow another list item (link)
@@ -47,15 +48,17 @@
}
// Open dropdowns
- &.open > a,
- &.open > a:hover,
- &.open > a:focus {
- color: #fff;
- background-color: @link-color;
- border-color: @link-color;
- .caret {
- border-top-color: #fff;
- border-bottom-color: #fff;
+ &.open > a {
+ &,
+ &:hover,
+ &:focus {
+ color: #fff;
+ background-color: @link-color;
+ border-color: @link-color;
+ .caret {
+ border-top-color: #fff;
+ border-bottom-color: #fff;
+ }
}
}
@@ -99,14 +102,16 @@
}
// Active state, and it's :hover to override normal :hover
- &.active > a,
- &.active > a:hover,
- &.active > a:focus {
- color: @gray;
- background-color: @body-bg;
- border: 1px solid #ddd;
- border-bottom-color: transparent;
- cursor: default;
+ &.active > a {
+ &,
+ &:hover,
+ &:focus {
+ color: @gray;
+ background-color: @body-bg;
+ border: 1px solid #ddd;
+ border-bottom-color: transparent;
+ cursor: default;
+ }
}
}
// pulling this in mainly for less shorthand
@@ -134,11 +139,13 @@
}
// Active state
- &.active > a,
- &.active > a:hover,
- &.active > a:focus {
- color: #fff;
- background-color: @component-active-bg;
+ &.active > a {
+ &,
+ &:hover,
+ &:focus {
+ color: #fff;
+ background-color: @component-active-bg;
+ }
}
}
}
@@ -218,9 +225,11 @@
.pill-content > .pill-pane {
display: none;
}
-.tab-content > .active,
-.pill-content > .active {
- display: block;
+.tab-content,
+.pill-content {
+ > .active {
+ display: block;
+ }
}