]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Fix some instances of lazy Sass math when multiplying new CSS var based border-width
authorMark Otto <markdotto@gmail.com>
Thu, 10 Mar 2022 20:38:07 +0000 (12:38 -0800)
committerMark Otto <otto@github.com>
Fri, 11 Mar 2022 17:04:13 +0000 (09:04 -0800)
scss/_list-group.scss
scss/_nav.scss
scss/_variables.scss

index 2c484ea236c6085461d8727a622d76cbfac8fe29..70506c8c6c36e8757c67822e5b0bf344aab16dfb 100644 (file)
@@ -63,7 +63,7 @@
     border-top-width: 0;
 
     &.active {
-      margin-top: -$list-group-border-width;
+      margin-top: calc($list-group-border-width * -1); // stylelint-disable-line function-disallowed-list
       border-top-width: $list-group-border-width;
     }
   }
           border-left-width: 0;
 
           &.active {
-            margin-left: -$list-group-border-width;
+            margin-left: calc($list-group-border-width * -1); // stylelint-disable-line function-disallowed-list
             border-left-width: $list-group-border-width;
           }
         }
index 8660a4dbc966a605df9408649e1221e71f85eaf9..62a2fa68283111dd2ee59dc3909e09d2598a604f 100644 (file)
@@ -42,7 +42,7 @@
   border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
 
   .nav-link {
-    margin-bottom: -$nav-tabs-border-width;
+    margin-bottom: calc($nav-tabs-border-width * -1); // stylelint-disable-line function-disallowed-list
     background: none;
     border: $nav-tabs-border-width solid transparent;
     @include border-top-radius($nav-tabs-border-radius);
@@ -70,7 +70,7 @@
 
   .dropdown-menu {
     // Make dropdown border overlap tab border
-    margin-top: -$nav-tabs-border-width;
+    margin-top: calc($nav-tabs-border-width * -1); // stylelint-disable-line function-disallowed-list
     // Remove the top rounded corners here since there is a hard edge above the menu
     @include border-top-radius(0);
   }
index ad2c959c5eb526b74a82b228e9b1f3b2ffb564a6..26707e775ee71d07f3b7f3fab46335b1f06a95dd 100644 (file)
@@ -1187,7 +1187,7 @@ $pagination-color:                  $link-color !default;
 $pagination-bg:                     $white !default;
 $pagination-border-radius:          $border-radius !default;
 $pagination-border-width:           var(--#{$variable-prefix}border-width) !default;
-$pagination-margin-start:           -$pagination-border-width !default;
+$pagination-margin-start:           calc($pagination-border-width * -1) !default; // stylelint-disable-line function-disallowed-list
 $pagination-border-color:           $gray-300 !default;
 
 $pagination-focus-color:            $link-hover-color !default;