NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 12:12:53 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
thatmattlove 2021-08-30 09:54:58 -07:00
parent 94d2ad120c
commit deda1691e9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/project-static/styles/netbox.scss
View File

@ -1,6 +1,7 @@
// Netbox-specific Styles and Overrides. // Netbox-specific Styles and Overrides.
@use 'sass:map'; @use 'sass:map';
@use 'sass:math';
@import './sidenav'; @import './sidenav';
@import './overrides'; @import './overrides';
@import './utilities'; @import './utilities';
@ -746,7 +747,7 @@ label.required {
div.bulk-buttons { div.bulk-buttons {
display: flex; display: flex;
justify-content: space-between; 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 // 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 // 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. // However, the rest of the buttons should have spacing applied in all directions.
> * { > * {
margin: $spacer / 4; margin: math.div($spacer, 4);
} }
} }
} }

9
netbox/project-static/styles/sidenav.scss
View File

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