]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Add null variables for nav-link
authorMark Otto <markdotto@gmail.com>
Mon, 15 Jun 2020 07:25:05 +0000 (00:25 -0700)
committerMark Otto <otto@github.com>
Sat, 11 Jul 2020 18:56:29 +0000 (11:56 -0700)
Replaces #30498 by adding four new null default variables for .nav-link. Doesn't carry over font-style from the original PR though since that's rarely used, at least by default Bootstrap. Nullifies all values from that PR, too, since we count on some basic inheritance here and don't need color by default.

scss/_nav.scss
scss/_variables.scss

index 84d522405f5e0cf8546d0b9de1fb516fdfa0de9a..30c2c819bd5e7a58a536750b4d4d860edf7afebc 100644 (file)
 .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);
 
   &:hover,
   &:focus {
+    color: $nav-link-hover-color;
     text-decoration: if($link-hover-decoration == underline, none, null);
   }
 
index 707908fa8cef03e901a7a9a8145f07bda13f1680..cac9febec6224336a31d1a758bb43cd3320d9302 100644 (file)
@@ -843,6 +843,10 @@ $zindex-tooltip:                    1070 !default;
 
 $nav-link-padding-y:                .5rem !default;
 $nav-link-padding-x:                1rem !default;
+$nav-link-font-size:                null !default;
+$nav-link-font-weight:              null !default;
+$nav-link-color:                    null !default;
+$nav-link-hover-color:              null !default;
 $nav-link-transition:               color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out !default;
 $nav-link-disabled-color:           $gray-600 !default;