diff options
author | MaZderMind | 2015-02-26 17:57:42 +0100 |
---|---|---|
committer | MaZderMind | 2015-02-26 17:57:42 +0100 |
commit | 6db2f0f4b9816ccd271332b89a05a9d0d753216b (patch) | |
tree | fd7ecf7cf16b33bdb75c45e747d12f9ecca43358 /assets/css/lib/bootstrap/_navs.scss | |
parent | 9fb5b19bb0652b9c187c9b552c0a7ec4d6778222 (diff) |
shuffle things around on the way to a bootstrap-based configurable website
Diffstat (limited to '')
-rw-r--r-- | assets/css/bootstrap-3.3.2/navs.less (renamed from assets/css/lib/bootstrap/_navs.scss) | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/assets/css/lib/bootstrap/_navs.scss b/assets/css/bootstrap-3.3.2/navs.less index 9016873..f26fec7 100644 --- a/assets/css/lib/bootstrap/_navs.scss +++ b/assets/css/bootstrap-3.3.2/navs.less @@ -10,7 +10,7 @@ margin-bottom: 0; padding-left: 0; // Override default ul/ol list-style: none; - @include clearfix(); + &:extend(.clearfix all); > li { position: relative; @@ -19,24 +19,24 @@ > a { position: relative; display: block; - padding: $nav-link-padding; + padding: @nav-link-padding; &:hover, &:focus { text-decoration: none; - background-color: $nav-link-hover-bg; + background-color: @nav-link-hover-bg; } } // Disabled state sets text to gray and nukes hover/tab effects &.disabled > a { - color: $nav-disabled-link-color; + color: @nav-disabled-link-color; &:hover, &:focus { - color: $nav-disabled-link-hover-color; + color: @nav-disabled-link-hover-color; text-decoration: none; background-color: transparent; - cursor: not-allowed; + cursor: @cursor-disabled; } } } @@ -46,8 +46,8 @@ &, &:hover, &:focus { - background-color: $nav-link-hover-bg; - border-color: $link-color; + background-color: @nav-link-hover-bg; + border-color: @link-color; } } @@ -57,7 +57,7 @@ // we missed it. We don't currently support this anywhere, but in the interest // of maintaining backward compatibility in case you use it, it's deprecated. .nav-divider { - @include nav-divider(); + .nav-divider(); } // Prevent IE8 from misplacing imgs @@ -74,7 +74,7 @@ // Give the tabs something to sit on .nav-tabs { - border-bottom: 1px solid $nav-tabs-border-color; + border-bottom: 1px solid @nav-tabs-border-color; > li { float: left; // Make the list-items overlay the bottom border @@ -83,11 +83,11 @@ // Actual tabs (as links) > a { margin-right: 2px; - line-height: $line-height-base; + line-height: @line-height-base; border: 1px solid transparent; - border-radius: $border-radius-base $border-radius-base 0 0; + border-radius: @border-radius-base @border-radius-base 0 0; &:hover { - border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; + border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color; } } @@ -96,9 +96,9 @@ &, &:hover, &:focus { - color: $nav-tabs-active-link-hover-color; - background-color: $nav-tabs-active-link-hover-bg; - border: 1px solid $nav-tabs-active-link-hover-border-color; + color: @nav-tabs-active-link-hover-color; + background-color: @nav-tabs-active-link-hover-bg; + border: 1px solid @nav-tabs-active-link-hover-border-color; border-bottom-color: transparent; cursor: default; } @@ -106,8 +106,8 @@ } // pulling this in mainly for less shorthand &.nav-justified { - @extend .nav-justified; - @extend .nav-tabs-justified; + .nav-justified(); + .nav-tabs-justified(); } } @@ -120,7 +120,7 @@ // Links rendered as pills > a { - border-radius: $nav-pills-border-radius; + border-radius: @nav-pills-border-radius; } + li { margin-left: 2px; @@ -131,8 +131,8 @@ &, &:hover, &:focus { - color: $nav-pills-active-link-hover-color; - background-color: $nav-pills-active-link-hover-bg; + color: @nav-pills-active-link-hover-color; + background-color: @nav-pills-active-link-hover-bg; } } } @@ -173,7 +173,7 @@ left: auto; } - @media (min-width: $screen-sm-min) { + @media (min-width: @screen-sm-min) { > li { display: table-cell; width: 1%; @@ -193,24 +193,24 @@ > li > a { // Override margin from .nav-tabs margin-right: 0; - border-radius: $border-radius-base; + border-radius: @border-radius-base; } > .active > a, > .active > a:hover, > .active > a:focus { - border: 1px solid $nav-tabs-justified-link-border-color; + border: 1px solid @nav-tabs-justified-link-border-color; } - @media (min-width: $screen-sm-min) { + @media (min-width: @screen-sm-min) { > li > a { - border-bottom: 1px solid $nav-tabs-justified-link-border-color; - border-radius: $border-radius-base $border-radius-base 0 0; + border-bottom: 1px solid @nav-tabs-justified-link-border-color; + border-radius: @border-radius-base @border-radius-base 0 0; } > .active > a, > .active > a:hover, > .active > a:focus { - border-bottom-color: $nav-tabs-justified-active-link-border-color; + border-bottom-color: @nav-tabs-justified-active-link-border-color; } } } @@ -223,9 +223,11 @@ .tab-content { > .tab-pane { display: none; + visibility: hidden; } > .active { display: block; + visibility: visible; } } @@ -238,5 +240,5 @@ // 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); + .border-top-radius(0); } |