Просмотр исходного кода

Fixes #7066: Migrate division statements in Sass from `/` to `math.div`

thatmattlove 4 лет назад
Родитель
Сommit
deda1691e9

+ 3 - 2
netbox/project-static/styles/netbox.scss

@@ -1,6 +1,7 @@
 // Netbox-specific Styles and Overrides.
 
 @use 'sass:map';
+@use 'sass:math';
 @import './sidenav';
 @import './overrides';
 @import './utilities';
@@ -746,7 +747,7 @@ label.required {
 div.bulk-buttons {
   display: flex;
   justify-content: space-between;
-  margin: $spacer / 2 0;
+  margin: math.div($spacer, 2) 0;
 
   // Each group of buttons needs to be contained separately for alignment purposes. This way, you
   // can put some buttons in a group that aligns left, and other buttons in a group that aligns
@@ -777,7 +778,7 @@ div.bulk-buttons {
 
     // However, the rest of the buttons should have spacing applied in all directions.
     > * {
-      margin: $spacer / 4;
+      margin: math.div($spacer, 4);
     }
   }
 }

+ 5 - 4
netbox/project-static/styles/sidenav.scss

@@ -1,4 +1,5 @@
 @use 'sass:map';
+@use 'sass:math';
 
 @mixin parent-link {
   .navbar-nav .nav-item .nav-link[data-bs-toggle] {
@@ -164,7 +165,7 @@
   }
 
   .nav-group-header {
-    padding: $sidenav-link-spacing-y / 2 $sidenav-link-spacing-x;
+    padding: math.div($sidenav-link-spacing-y, 2) $sidenav-link-spacing-x;
     margin-top: 0.5rem;
     margin-bottom: 0;
   }
@@ -184,9 +185,9 @@
 
   @include child-link() {
     width: 100%;
-    padding-top: $sidenav-link-spacing-y / 2;
+    padding-top: math.div($sidenav-link-spacing-y, 2);
     padding-right: map.get($spacers, 1);
-    padding-bottom: $sidenav-link-spacing-y / 2;
+    padding-bottom: math.div($sidenav-link-spacing-y, 2);
     padding-left: $sidenav-link-spacing-x;
     margin-top: 0;
     margin-bottom: 0;
@@ -203,7 +204,7 @@
   @include parent-link() {
     width: unset;
     height: 100%;
-    padding-left: $sidenav-link-spacing-x / 2;
+    padding-left: math.div($sidenav-link-spacing-x, 2);
     font-weight: $font-weight-bold;
     color: var(--nbx-sidenav-parent-color);