From f3b4308cb59bf4b21ff186f8479c82239446d139 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 7 Jun 2021 12:56:27 +0200 Subject: upgrade to bootstrap 5.0.1 and first batch of fixes --- vendor/twbs/bootstrap/scss/_nav.scss | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'vendor/twbs/bootstrap/scss/_nav.scss') diff --git a/vendor/twbs/bootstrap/scss/_nav.scss b/vendor/twbs/bootstrap/scss/_nav.scss index fad684e57..ffb27d869 100644 --- a/vendor/twbs/bootstrap/scss/_nav.scss +++ b/vendor/twbs/bootstrap/scss/_nav.scss @@ -14,10 +14,16 @@ .nav-link { display: block; padding: $nav-link-padding-y $nav-link-padding-x; + @include font-size($nav-link-font-size); + font-weight: $nav-link-font-weight; + color: $nav-link-color; text-decoration: if($link-decoration == none, null, none); + @include transition($nav-link-transition); - @include hover-focus() { - text-decoration: none; + &:hover, + &:focus { + color: $nav-link-hover-color; + text-decoration: if($link-hover-decoration == underline, none, null); } // Disabled state lightens text @@ -37,11 +43,15 @@ .nav-link { margin-bottom: -$nav-tabs-border-width; + background: none; border: $nav-tabs-border-width solid transparent; @include border-top-radius($nav-tabs-border-radius); - @include hover-focus() { + &:hover, + &:focus { border-color: $nav-tabs-link-hover-border-color; + // Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link + isolation: isolate; } &.disabled { @@ -73,13 +83,15 @@ .nav-pills { .nav-link { + background: none; + border: 0; @include border-radius($nav-pills-border-radius); } .nav-link.active, .show > .nav-link { color: $nav-pills-link-active-color; - background-color: $nav-pills-link-active-bg; + @include gradient-bg($nav-pills-link-active-bg); } } @@ -105,6 +117,13 @@ } } +.nav-fill, +.nav-justified { + .nav-item .nav-link { + width: 100%; // Make sure button will grow + } +} + // Tabbable tabs // -- cgit v1.2.3