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.

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

chore: address sass deprecation warnings #9167

Open
wants to merge 2 commits into
base: ux-integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";
/* UI Primary Colors */
$ui-blue: hsla(215, 100%, 65%, 1); // #4C97FF Motion Primary
$ui-blue-dark: hsla(215, 65%, 55%, 1); // #3373CC Motion Secondary
Expand Down Expand Up @@ -33,7 +34,7 @@ $ui-cyan-blue: hsla(194, 73%, 36%, 1); //#19809F
/* 3.0 colors */
/* Using www naming convention for now, should be consistent with gui */
$ui-aqua: hsla(144, 45%, 36%, 1);
$ui-aqua-dark: darken($ui-aqua, 10%);
$ui-aqua-dark: color.adjust($ui-aqua, $lightness: -10%);
$ui-purple-light: hsla(260, 100%, 88%, 1); // #DACEF3
$ui-purple: hsla(260, 100%, 70%, 1); // #9966FF Looks Primary
$ui-purple-dark: hsla(260, 60%, 60%, 1); // #855CD6 Looks Secondary
Expand Down
12 changes: 6 additions & 6 deletions src/components/adminpanel/adminpanel.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@import "../../colors";
@use "../../colors";

.admin-panel {
position: fixed;
top: 0;
left: 0;
z-index: 99;
border: 1px solid $ui-gray;
box-shadow: 0 2px 5px $box-shadow-gray;
background-color: $ui-gray;
border: 1px solid colors.$ui-gray;
box-shadow: 0 2px 5px colors.$box-shadow-gray;
background-color: colors.$ui-gray;
padding: 1rem;
width: 230px;
height: 100%;
Expand All @@ -33,8 +33,8 @@
padding: .5rem 1rem;

&.inprogress {
background-color: $ui-dark-gray;
color: $type-gray;
background-color: colors.$ui-dark-gray;
color: colors.$type-gray;
}
}
}
Expand Down
35 changes: 17 additions & 18 deletions src/components/box/box.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
@import "../../colors";
@import "../../frameless";
@use "../../colors";
@use "../../frameless";

$base-bg: $ui-white;
$base-bg: colors.$ui-white;

.box {
display: inline-block;
border: 1px solid $ui-border;
border: 1px solid colors.$ui-border;
border-radius: 10px 10px 0 0;
background-color: colors.$ui-white;
width: 100%;

//4 columns
@media #{$small} {
width: $cols4;
@media #{frameless.$small} {
width: frameless.$cols4;

.box-header {
h4,
Expand All @@ -22,8 +24,8 @@ $base-bg: $ui-white;
}

//6 columns
@media #{$medium} {
width: $cols6;
@media #{frameless.$medium} {
width: frameless.$cols6;

.box-header {
h4,
Expand All @@ -35,8 +37,8 @@ $base-bg: $ui-white;
}

//8 columns
@media #{$intermediate} {
width: $cols8;
@media #{frameless.$intermediate} {
width: frameless.$cols8;

.box-header {
h4,
Expand All @@ -48,8 +50,8 @@ $base-bg: $ui-white;
}

//12 columns
@media #{$big} {
width: $cols12;
@media #{frameless.$big} {
width: frameless.$cols12;

.box-header {
h4,
Expand All @@ -60,17 +62,14 @@ $base-bg: $ui-white;
}
}

background-color: $ui-white;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this deleted? It wasn't used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is moved to line 10

width: 100%;

.box-header {
display: block;
clear: both;
margin: 0;
border-top: 1px solid $ui-white;
border-bottom: 1px solid $ui-border;
border-top: 1px solid colors.$ui-white;
border-bottom: 1px solid colors.$ui-border;
border-radius: 10px 10px 0 0;
background-color: $ui-gray;
background-color: colors.$ui-gray;

padding: 8px 20px;
height: 20px;
Expand Down
18 changes: 9 additions & 9 deletions src/components/card/card.scss
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
@use "sass:math";

@import "../../colors";
@import "../../frameless";
@use "../../colors";
@use "../../frameless";

.card {
border-radius: math.div(8px, $em);
box-shadow: 0 0 0 .125rem $active-gray;
background-color: $ui-white;
border-radius: math.div(8px, frameless.$em);
box-shadow: 0 0 0 .125rem colors.$active-gray;
background-color: colors.$ui-white;

.card-button {
display: block;
border-radius: .5rem;
border-top-left-radius: 0;
border-top-right-radius: 0;
box-shadow: none;
background-color: $ui-aqua;
background-color: colors.$ui-aqua;
width: 23.75rem;
height: 4rem;

Expand All @@ -35,7 +35,7 @@

&.has-error {
.input {
border: 1px solid $ui-red-dark;
border: 1px solid colors.$ui-red-dark;
}
}

Expand All @@ -46,7 +46,7 @@
}
}

@media #{$small} {
@media #{frameless.$small} {
.card {
width: 22.5rem;

Expand All @@ -60,7 +60,7 @@
}
}

@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
.card {
.input {
width: 90%;
Expand Down
24 changes: 12 additions & 12 deletions src/components/cards-modal/cards-modal.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../colors";
@import "../../frameless";
@use "../../colors";
@use "../../frameless";

.cards-modal-overlay {
display: flex;
Expand All @@ -13,7 +13,7 @@
left: 0;
z-index: 510;

background-color: $box-shadow-light-gray;
background-color: colors.$box-shadow-light-gray;
border-color: unset;
}

Expand All @@ -25,7 +25,7 @@
border-radius: 8px;
width: 656px;

box-shadow: 0 0 0 4px $ui-blue-25percent;
box-shadow: 0 0 0 4px colors.$ui-blue-25percent;

&:focus {
outline: none;
Expand All @@ -38,14 +38,14 @@
align-items: center;

padding: 10px;
background-color: $ui-blue;
background-color: colors.$ui-blue;
border-radius: 8px 8px 0 0;

.cards-title {
font-size: 1rem;
font-weight: 700;
line-height: 1.25rem;
color: $ui-white;
color: colors.$ui-white;
margin-left: auto;
margin-right: auto;
}
Expand All @@ -60,7 +60,7 @@
text-align: center;
vertical-align: middle;

color: $header-gray;
color: colors.$header-gray;
font-size: 1.5rem;
font-weight: 700;
line-height: 2rem;
Expand Down Expand Up @@ -103,7 +103,7 @@
}

.card + .card {
border-top: 1px solid $box-shadow-light-gray;
border-top: 1px solid colors.$box-shadow-light-gray;
}
}
}
Expand All @@ -128,12 +128,12 @@
width: 8px;
height: 8px;
background-color: transparent;
border: 2px solid $ui-blue;
border: 2px solid colors.$ui-blue;
}

.active{
background-color: $ui-blue;
box-shadow: 0 0 0 4px $ui-blue-25percent;
background-color: colors.$ui-blue;
box-shadow: 0 0 0 4px colors.$ui-blue-25percent;
}
}
}
Expand All @@ -143,7 +143,7 @@
border: none;
}

@media only screen and (max-width: $mobileIntermediate) {
@media only screen and (max-width: frameless.$mobileIntermediate) {
.cards-modal-container {
width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/carousel/carousel.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../colors";
@use "../../colors";

.carousel {
$icon-size: 40px;
Expand Down
12 changes: 6 additions & 6 deletions src/components/comment/comment.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "../../colors";
@use "../../colors";

.comment-text {
position: relative;
border: 1px solid $ui-border;
border: 1px solid colors.$ui-border;
border-radius: 0 5px 5px 5px;
padding: 1rem;
}
Expand All @@ -12,8 +12,8 @@
position: absolute;
top: -1px;
left: -13px;
border-bottom: 12px solid $ui-border;
border-left: 13px solid $ui-border;
border-bottom: 12px solid colors.$ui-border;
border-left: 13px solid colors.$ui-border;
border-radius: 0 0 0 13px;
width: 0;
content: "";
Expand All @@ -24,8 +24,8 @@
position: absolute;
top: 0;
left: -12px;
border-bottom: 10px solid $ui-white;
border-left: 12px solid $ui-white;
border-bottom: 10px solid colors.$ui-white;
border-left: 12px solid colors.$ui-white;
border-radius: 0 0 0 12px;
width: 0;
content: "";
Expand Down
6 changes: 3 additions & 3 deletions src/components/commenting-status/commenting-status.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import "../../colors";
@use "../../colors";

.commenting-status {
border: 1px solid $ui-blue-10percent;
border: 1px solid colors.$ui-blue-10percent;
border-radius: 8px;
padding: 1.75rem 3rem 2rem;
margin: .5rem 0 2rem;
background-color: $ui-blue-10percent;
background-color: colors.$ui-blue-10percent;
text-align: center;
box-sizing: border-box;

Expand Down
14 changes: 7 additions & 7 deletions src/components/community-guidelines/community-guidelines.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../colors";
@import "../../frameless";
@use "../../colors";
@use "../../frameless";

.col{
display: flex;
Expand Down Expand Up @@ -29,7 +29,7 @@
max-width: 1000px;
padding: auto;
margin: auto;
@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
flex-direction: column;
}
}
Expand All @@ -40,14 +40,14 @@
flex: 4;
justify-content: center;
align-items: center;
@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
flex: 12;
order: 1;
align-items: flex-end;
}

img{
@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
width: 300px;
height: 300px;
}
Expand All @@ -65,7 +65,7 @@
align-items: flex-start;
flex-direction: column;
padding: 40px;
@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
flex: 12;
order: 2;
padding-top: 0px;
Expand All @@ -82,7 +82,7 @@
height: 65px;
top: 172px;
left: 149px;
@media #{$medium-and-smaller} {
@media #{frameless.$medium-and-smaller} {
width: 60px !important;
height: 60px !important;
top: 140.5px;
Expand Down
10 changes: 5 additions & 5 deletions src/components/crashmessage/crashmessage.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@use "../../colors";
@use "../../frameless";

.crash-container {
@import "../../colors";
@import "../../frameless";

margin: 3rem auto;

border: 1px solid $ui-border;
border: 1px solid colors.$ui-border;
border-radius: 10px;
background-color: $background-color;
background-color: colors.$background-color;
width: 60%;
overflow: hidden;
text-align: center;
Expand Down
6 changes: 3 additions & 3 deletions src/components/deck/deck.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../../colors";
@import "../../frameless";
@use "../../colors";
@use "../../frameless";

@include responsive-layout (".deck", ".slide");
@include frameless.responsive-layout (".deck", ".slide");

.deck {
min-height: 100vh;
Expand Down
Loading