Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent sass deprecation warnings #3615

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Prevent sass deprecation warnings #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions perma_web/static/bundles/global.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion perma_web/static/bundles/global.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion perma_web/static/bundles/single-link.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion perma_web/static/bundles/single-link.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions perma_web/static/css/_vars-global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

$grid: 8px;
$double: $grid * 2;
$half: $grid / 2;
$half: $grid * 0.5;

$col-gutter: $grid * 4;
$bleed: -1 * ($col-gutter / 2);
$bleed: -1 * ($col-gutter * 0.5);
$page-margin: $grid * 2;

/////////////////////////
Expand Down
8 changes: 1 addition & 7 deletions perma_web/static/css/style-responsive-archive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,20 +1046,14 @@ li.dropdown {
}

.navbar-nav {
margin: 0 -$grid $double -$grid;
margin: 0 (-$grid) $double (-$grid);
@include respond-tablet {
margin: 0;
}
}

// ui-tray

%ui-tray-alignment {
padding-left: $grid * 5;
padding-right: $grid * 5;
margin: 0 -$double;
}

.ui-tray {
z-index: 100;
background-color: white;
Expand Down
22 changes: 11 additions & 11 deletions perma_web/static/css/style-responsive.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

// Global imports

@use "sass:math";

@import "bootstrap-custom";
@import "bootstrap-mod";

Expand Down Expand Up @@ -1033,9 +1035,9 @@ a.cc {
}

.row.row-halfgutter {
margin: 0 $bleed / 2 !important;
margin: 0 $bleed * 0.5 !important;
@include all-columns {
padding: 0 $bleed / -2;
padding: 0 math.div($bleed, -2);
}
}

Expand All @@ -1049,8 +1051,6 @@ a.cc {
margin-right: -2px;
}

.col {}

.col.col-no-gutter {
padding-left: 0;
padding-right: 0;
Expand All @@ -1075,31 +1075,31 @@ div.col-right {

.col-sm-10by3 {
@include respond-tablet {
width: 100% * (5 / 18); // 10/3 width
width: 100% * math.div(5, 18); // 10/3 width
float: left;
}
}

.col-sm-by4 {
width: 100%;
@include respond-desktop {
width: 100 / 4 * 1%;
width: 100 * 0.25 * 1%;
float: left;
}
}

.col-sm-by5 {
width: 100%;
@include respond-desktop {
width: 100 / 5 * 1%;
width: 100 * 0.2 * 1%;
float: left;
}
}

.col-sm-by6 {
width: 100%;
@include respond-desktop {
width: 100 / 6 * 1%;
width: math.div(100, 6) * 1%;
float: left;
}
}
Expand Down Expand Up @@ -4039,10 +4039,10 @@ footer {
.item-container._isExpandable {
&._active {
@include style-card(black);
margin: 0 -$grid $double -$grid;
margin: 0 (-$grid) $double (-$grid);
padding: $grid * 2 $grid;
@include respond-tablet {
margin: 0 -$double $double -$double;
margin: 0 (-$double) $double (-$double);
padding: $grid * 2 $double;
}
&:hover {
Expand Down Expand Up @@ -4891,7 +4891,7 @@ h6.image-hed {
border-bottom: 1px solid $color-blue;
}
.row.outer {
margin: 0 -$grid * 4;
margin: 0 (-$grid * 4);
}
.col-xs-12 {
border-bottom: 1px solid $color-blue;
Expand Down
Loading