diff options
Diffstat (limited to 'assets/stylesheets/bootstrap/_nav.scss')
| -rw-r--r-- | assets/stylesheets/bootstrap/_nav.scss | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/assets/stylesheets/bootstrap/_nav.scss b/assets/stylesheets/bootstrap/_nav.scss index f7b83c6..6bb09fd 100644 --- a/assets/stylesheets/bootstrap/_nav.scss +++ b/assets/stylesheets/bootstrap/_nav.scss @@ -23,7 +23,7 @@ @include plain-hover-focus { color: $nav-disabled-link-hover-color; cursor: $cursor-disabled; - background-color: transparent; + background-color: $nav-disabled-link-hover-bg; } } } @@ -38,7 +38,7 @@ .nav-item + .nav-item, .nav-link + .nav-link { - margin-left: 1rem; + margin-left: $nav-item-inline-spacer; } } @@ -48,23 +48,23 @@ // .nav-tabs { - border-bottom: 1px solid $nav-tabs-border-color; + border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color; @include clearfix(); .nav-item { float: left; // Make the list-items overlay the bottom border - margin-bottom: -1px; + margin-bottom: -$nav-tabs-border-width; + .nav-item { - margin-left: .2rem; + margin-left: $nav-item-margin; } } .nav-link { display: block; padding: $nav-link-padding; - border: $nav-tabs-link-border-width solid transparent; + border: $nav-tabs-border-width solid transparent; @include border-radius($border-radius $border-radius 0 0); @include hover-focus { @@ -88,6 +88,13 @@ border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color transparent; } } + + .dropdown-menu { + // Make dropdown border overlap tab border + margin-top: -$nav-tabs-border-width; + // Remove the top rounded corners here since there is a hard edge above the menu + @include border-top-radius(0); + } } @@ -102,7 +109,7 @@ float: left; + .nav-item { - margin-left: .2rem; + margin-left: $nav-item-margin; } } @@ -115,9 +122,9 @@ .nav-link.active, .nav-item.open .nav-link { @include plain-hover-focus { - color: $component-active-color; + color: $nav-pills-active-link-color; cursor: default; - background-color: $component-active-bg; + background-color: $nav-pills-active-link-bg; } } } @@ -128,7 +135,7 @@ float: none; + .nav-item { - margin-top: .2rem; + margin-top: $nav-item-margin; margin-left: 0; } } @@ -148,15 +155,3 @@ display: block; } } - - -// -// Dropdowns -// - -.nav-tabs .dropdown-menu { - // Make dropdown border overlap tab border - margin-top: -1px; - // Remove the top rounded corners here since there is a hard edge above the menu - @include border-top-radius(0); -} |