]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Revamp tabbed nav border variables
authorMark Otto <markdotto@gmail.com>
Wed, 6 Jan 2016 23:45:26 +0000 (15:45 -0800)
committerMark Otto <markdotto@gmail.com>
Wed, 6 Jan 2016 23:45:26 +0000 (15:45 -0800)
- Add new $nav-tabs-border-width for the bottom border on the .nav-tabs
parent class
- Use that new variable for the negative margin on nav-items within it
for consistent customization
- Drop the $nav-tabs-link-border-width for the new variable so it’s all
tied together

scss/_nav.scss
scss/_variables.scss

index 398ee1039b4f2e5f09b65904245f83a9f38a81e4..2c5f5b4c69741413859fc4d65ec6d29e0a03e5e0 100644 (file)
 //
 
 .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: $nav-item-margin;
@@ -64,7 +64,7 @@
   .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 {
index a01443dc51410f39c3be2292f370a4f2a2b06893..7b1cb713a7eabdecb63b5461e9beb0cb693f37cf 100644 (file)
@@ -399,8 +399,8 @@ $nav-disabled-link-hover-color:             $gray-light !default;
 $nav-disabled-link-hover-bg:                transparent !default;
 
 $nav-tabs-border-color:                     #ddd !default;
+$nav-tabs-border-width:                     $border-width !default;
 
-$nav-tabs-link-border-width:                $border-width !default;
 $nav-tabs-link-hover-border-color:          $gray-lighter !default;
 
 $nav-tabs-active-link-hover-bg:             $body-bg !default;