Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Vanduynslager <pierre.denis.vanduynslager@gmail.com>2017-04-02 12:21:04 +0300
committerJohann-S <johann.servoire@gmail.com>2017-04-02 12:21:04 +0300
commit91b62941afb7115807fc2925398ebccfc68f5377 (patch)
tree7efa4b4398a0797fab354aa2226fd31241d62e09 /scss/_nav.scss
parent5142de7e592abc0a791ea3465616795c91219bcc (diff)
Tabs/Scrollspy/.nav/.list-group/.active independent of markup (<nav>, .nav-item, <li> etc...)
Diffstat (limited to 'scss/_nav.scss')
-rw-r--r--scss/_nav.scss18
1 files changed, 11 insertions, 7 deletions
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 58e71eca40..6391932619 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -26,7 +26,6 @@
}
}
-
//
// Tabs
//
@@ -34,10 +33,15 @@
.nav-tabs {
border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
- .nav-item {
+ .nav-item,
+ .nav-link {
margin-bottom: -$nav-tabs-border-width;
}
+ .nav-item .nav-link {
+ margin-bottom: 0;
+ }
+
.nav-link {
border: $nav-tabs-border-width solid transparent;
@include border-top-radius($nav-tabs-border-radius);
@@ -76,12 +80,12 @@
.nav-pills {
.nav-link {
@include border-radius($nav-pills-border-radius);
- }
- .nav-link.active,
- .nav-item.show .nav-link {
- color: $nav-pills-active-link-color;
- background-color: $nav-pills-active-link-bg;
+ &.active,
+ .show & {
+ color: $nav-pills-active-link-color;
+ background-color: $nav-pills-active-link-bg;
+ }
}
}