Skip to content

Fix sass deprecation warnings #726

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

Open
clemiller wants to merge 1 commit into
base: develop
Choose a base branch
from
+83 −83
Open

Fix sass deprecation warnings #726

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
8 changes: 5 additions & 3 deletions nav-app/src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
@use 'sass:color';

@import '../colors.scss';

.app-container {
@include adaptive-color('background-color', color(body), color(dark-1));
height: 100vh;
@include adaptive-color('background-color', color(body), color(dark-1));
}

.nav-app {
@include adaptive-color('background-color', color(light), darken(color(dark), 8%));
@include adaptive-color('background-color', color(light), color.scale(color(dark), $lightness: -8%));

tabs {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-size: 9pt;
}

.version-footer {
@include adaptive-color('color', on-color(light), on-color(dark-2));
font-size: 7pt;
border: none;
background-color: transparent;
Expand All @@ -24,6 +25,7 @@
display: block;
position: fixed;
bottom: 16px;
@include adaptive-color('color', on-color(light), on-color(dark-2));
&:hover {
text-decoration: underline;
cursor: pointer;
Expand Down
6 changes: 4 additions & 2 deletions nav-app/src/app/datatable/data-table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../../colors.scss';
@import '../../styles.scss';

Expand All @@ -15,7 +17,7 @@ $cellSize: 15px;

// content of each tab
.matrices {
@include adaptive-color-dark-only('background-color', lighten(color(dark-1), 3%));
@include adaptive-color-dark-only('background-color', color.scale(color(dark-1), $lightness: 3%));
@include adaptive-color-dark-only('color', on-color(dark));
@include adaptive-color-dark-only('border', none);
overflow-x: scroll;
Expand Down Expand Up @@ -81,7 +83,7 @@ $cellSize: 15px;
display: block;
height: $cellSize;
font-size: 10pt;
color: darken(white, 50%);
color: color.scale(white, $lightness: -50%);
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions nav-app/src/app/layer-settings/layer-settings.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../../colors.scss';
.layer-settings {
.sidebar-content {
Expand Down Expand Up @@ -52,10 +54,10 @@
&.mat-form-field-disabled {
.mat-mdc-floating-label,
.mdc-text-field__input {
@include adaptive-color-dark-only('color', darken(on-color(dark-1), 25%));
@include adaptive-color-dark-only('color', color.scale(on-color(dark-1), $lightness: -25%));
}
.mdc-line-ripple::before {
@include adaptive-color-dark-only('border-bottom-color', darken(on-color(dark-1), 25%));
@include adaptive-color-dark-only('border-bottom-color', color.scale(on-color(dark-1), $lightness: -25%));
}
}
.mat-mdc-form-field-hint {
Expand Down
6 changes: 4 additions & 2 deletions nav-app/src/app/layer-upgrade/layer-upgrade.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../../colors.scss';

.title {
Expand Down Expand Up @@ -30,7 +32,7 @@ h4 {
cursor: pointer;
box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.5);
&:hover {
background-color: darken(color(panel-dark), 5%);
background-color: color.scale(color(panel-dark), $lightness: -5%);
}
}

Expand Down Expand Up @@ -97,7 +99,7 @@ tr td {
font-size: 16px;
}
&:disabled {
@include adaptive-color('background-color', lighten(color(panel-dark), 5%), color(dark-2));
@include adaptive-color('background-color', color.scale(color(panel-dark), $lightness: 5%), color(dark-2));
cursor: unset;
}
}
Expand Down
4 changes: 3 additions & 1 deletion nav-app/src/app/list-input/list-input.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../../colors.scss';

.list-container,
Expand Down Expand Up @@ -66,7 +68,7 @@
&.divider {
.line,
.icon {
@include adaptive-color('background-color', darken(color(panel-dark), 40%), lighten(color(dark-4), 40%));
@include adaptive-color('background-color', color.scale(color(panel-dark), $lightness: -40%), color.scale(color(dark-4), $lightness: 40%));
}
}
&:hover .line,
Expand Down
6 changes: 4 additions & 2 deletions nav-app/src/app/matrix/matrix-flat/matrix-flat.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../matrix-common.scss';
.matrix.flat {
.tactic {
Expand All @@ -20,7 +22,7 @@
position: sticky;
top: 0.05px;
z-index: 9999;
@include adaptive-color-dark-only('background-color', lighten(color(dark-1), 3%));
@include adaptive-color-dark-only('background-color', color.scale(color(dark-1), $lightness: 3%));
@include adaptive-color-light-only('background-color', white);
}

Expand All @@ -35,7 +37,7 @@
position: sticky;
top: 32px;
z-index: 9999;
@include adaptive-color-dark-only('background-color', lighten(color(dark-1), 3%));
@include adaptive-color-dark-only('background-color', color.scale(color(dark-1), $lightness: 3%));
@include adaptive-color-light-only('background-color', white);
}

Expand Down
10 changes: 0 additions & 10 deletions nav-app/src/app/matrix/matrix-mini/matrix-mini.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,15 @@
.tactic.body {
padding-top: 5px;
vertical-align: top;
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;

.cell-container {
margin-right: math.div($sizeunit, 6);
margin-bottom: math.div($sizeunit, 6);
&:not(.supertechnique-group) {
display: inline-block;
}
// margin: 0 2px 0 2px;
&.supertechnique-group {
// background: color(panel-light);
// border-top: 1px solid darken(color(panel-light), 5%);
// border-bottom: 1px solid darken(color(panel-light), 5%);
// padding-top: 3px;
// transform: translateX(-3px);
box-shadow: 0 0 0 1px on-color-deemphasis(body) inset;
// padding: 3px 0 0 3px;
padding-top: 1px + math.div($sizeunit, 2);
padding-left: 1px + math.div($sizeunit, 2);
padding-bottom: math.div($sizeunit, 3);
Expand Down
17 changes: 4 additions & 13 deletions nav-app/src/app/matrix/matrix-side/matrix-side.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
@use 'sass:color';
@import '../matrix-common.scss';
.matrix.side {
// thead {
// // background-color: color(matrix-header);
// // color: on-color(matrix-header);
// @include adaptive-color-dark-only("background-color", lighten(color(dark-1), 3%));
// }
// white-space: nowrap;
.tactic {
padding: 2px;
width: 1%;
Expand All @@ -18,15 +13,14 @@
&.name {
cursor: pointer;
font-weight: bold;
// height: (($sizeunit + 2) * 3);
vertical-align: bottom;
@media print {
font-size: $sizeunit_print - 4px;
}
position: sticky;
top: 0.05px;
z-index: 9999;
@include adaptive-color-dark-only('background-color', lighten(color(dark-1), 3%));
@include adaptive-color-dark-only('background-color', color.scale(color(dark-1), $lightness: 3%));
@include adaptive-color-light-only('background-color', white);
}
&.count {
Expand All @@ -42,7 +36,7 @@
position: sticky;
top: 35px;
z-index: 9999;
@include adaptive-color-dark-only('background-color', lighten(color(dark-1), 3%));
@include adaptive-color-dark-only('background-color', color.scale(color(dark-1), $lightness: 3%));
@include adaptive-color-light-only('background-color', white);
}
.techniques-table {
Expand All @@ -66,10 +60,7 @@
td {
padding: 0;
vertical-align: top;

&.technique {
// outline: 1px solid on-color-deemphasis(body);
// outline-offset: -1px;
@include adaptive-color('box-shadow', 0 0 0 1px on-color-deemphasis(body) inset, 0 0 0 1px color(dark-3) inset);
}
}
Expand Down Expand Up @@ -123,7 +114,7 @@
pointer-events: none;
}
&.expanded .angle {
@include adaptive-color('background', color(body), lighten(color(dark-1), 3%));
@include adaptive-color('background', color(body), color.scale(color(dark-1), $lightness: 3%));
height: 12px;
display: block;
position: absolute;
Expand Down
4 changes: 3 additions & 1 deletion nav-app/src/app/matrix/technique-cell/contextmenu/contextmenu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:color';

@import '../cell-popover.scss';
@import '../../../../colors.scss';
.contextmenu {
Expand Down Expand Up @@ -33,7 +35,7 @@
.contextMenu-button {
cursor: pointer;
&:hover {
@include adaptive-color('background', color(cell-highlight-color), darken(color(cell-highlight-dark-color), 10%));
@include adaptive-color('background', color(cell-highlight-color), color.scale(color(cell-highlight-dark-color), $lightness: -10%));
}
}
}
Expand Down
Loading