diff options
author | Mark Otto <markdotto@gmail.com> | 2015-08-19 06:25:31 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2015-08-19 06:25:31 +0300 |
commit | c8306d2f704685dfc68e530cf3e820cb65cedc18 (patch) | |
tree | 3c15763b91613725dd6916cc8f41b385d9ff7772 /scss | |
parent | d2f4c350614ce64f6e22cc21f48a8834bfaa4e9d (diff) |
rewrite active and disabled styles for navs
Diffstat (limited to 'scss')
-rw-r--r-- | scss/_nav.scss | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss index 813ac36ffe..aa8a01e481 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -17,7 +17,6 @@ } // Disabled state lightens text and removes hover/tab effects - .disabled > &, &.disabled { color: $nav-disabled-link-color; @@ -83,6 +82,7 @@ .nav-tabs { border-bottom: 1px solid $nav-tabs-border-color; + @include clearfix(); .nav-item { float: left; @@ -103,27 +103,24 @@ @include hover-focus { border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; } + + &.disabled { + @include plain-hover-focus { + color: $nav-disabled-link-color; + background-color: transparent; + border-color: transparent; + } + } } - .open > .nav-link, - .active > .nav-link, - .nav-link.open, - .nav-link.active { + .nav-link.active, + .nav-item.open .nav-link { @include plain-hover-focus { color: $nav-tabs-active-link-hover-color; background-color: $nav-tabs-active-link-hover-bg; border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color transparent; } } - - .disabled > .nav-link, - .nav-link.disabled { - @include plain-hover-focus { - color: $nav-disabled-link-color; - background-color: transparent; - border-color: transparent; - } - } } @@ -146,10 +143,8 @@ @include border-radius($nav-pills-border-radius); } - .open > .nav-link, - .active > .nav-link, - .nav-link.open, - .nav-link.active { + .nav-link.active, + .nav-item.open .nav-link { @include plain-hover-focus { color: $component-active-color; cursor: default; |