Skip to content

feat: move from node-sass to sass #3159

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

Merged
hevele-moda merged 1 commit into from
Jan 4, 2023
Merged

feat: move from node-sass to sass #3159

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
2 changes: 1 addition & 1 deletion documentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
]
},
"devDependencies": {
"node-sass": "^8.0.0"
"sass": "^1.57.1"
}
}
1,616 changes: 384 additions & 1,232 deletions documentation/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@moda/icons": "^5.18.0",
"@moda/tokens": "^5.5.1",
"@moda/tokens": "^5.7.0",
"@types/classnames": "^2.2.9",
"classnames": "^2.2.6",
"credit-card-type": "^9.0.0",
Expand Down Expand Up @@ -120,7 +120,6 @@
"jest-environment-jsdom": "^29.0.0",
"jest-matchmedia-mock": "^1.1.0",
"lint-staged": "^13.0.0",
"node-sass": "^8.0.0",
"node-sass-package-importer": "^5.3.2",
"pinst": "^3.0.0",
"postcss": "^8.1.10",
Expand All @@ -133,6 +132,7 @@
"rollup": "^3.2.3",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-scss": "^4.0.0",
"sass": "^1.57.1",
"sass-loader": "^13.0.0",
"semantic-release": "^19.0.2",
"storybook-states": "^1.2.0",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Badge/Badge.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
&--forest-green {
background-color: color(forest-green);
border-color: transparent;
color: color(snow);
color: color('snow');
}

&--klein-blue {
background-color: color(klein-blue);
border-color: transparent;
color: color(snow);
color: color('snow');
}

&--brick {
background-color: color(brick);
border-color: transparent;
color: color(snow);
color: color('snow');
}

&--dark-fuchsia {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Breakpoint/Breakpoint.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@use 'sass:math';
@import '~om';

.Breakpoint {
$onePixel: 1/16;
$onePixel: math.div(1, 16);
$keys: map-keys($breakpoints);

display: none;
Expand Down
12 changes: 6 additions & 6 deletions src/components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@

&,
&--primary {
color: color(snow);
color: color('snow');
border-color: color(ink);
background-color: color(ink);
@include font-smoothing(subpixel);

&#{$self}--hover,
&:hover {
color: color(snow);
color: color('snow');
border-color: color(fog, 0.32);
background: linear-gradient(0deg, color(fog, 0.32), color(fog, 0.32)), color(ink);
}

&#{$self}--focus,
&:focus {
color: color(snow);
color: color('snow');
border-color: color(fog, 0.12);
background: linear-gradient(0deg, color(snow, 0.12), color(snow, 0.12)), color(ink);
background: linear-gradient(0deg, color('snow', 0.12), color('snow', 0.12)), color(ink);
}

&#{$self}--disabled,
Expand All @@ -54,7 +54,7 @@
&--secondary {
color: color(ink);
border-color: color(ink);
background-color: color(snow);
background-color: color('snow');

&#{$self}--hover,
&:hover {
Expand Down Expand Up @@ -86,7 +86,7 @@
padding: spacing(2, 3);
color: color(ink);
border-color: color(elephant);
background-color: color(snow);
background-color: color('snow');
text-transform: none;
line-height: 1.4;

Expand Down
4 changes: 2 additions & 2 deletions src/components/Checkbox/Checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

.Checkbox {
$checkbox-size: space(4);
$checkbox-check-offset: space(1) / 2;
$checkbox-check-offset: calc(space(1) / 2);

@include stack(2, $direction: horizontal);

Expand All @@ -16,7 +16,7 @@
position: relative;
width: $checkbox-size;
height: $checkbox-size;
margin-top: space(1) / 2;
margin-top: calc(space(1) / 2);
flex-shrink: 0;
border: 1px solid;

Expand Down
6 changes: 3 additions & 3 deletions src/components/ColorSwatch/ColorSwatch.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
height: 33%;
transform: translate(-50%, -50%);
border-radius: 50%;
background-color: color(snow);
background-color: color('snow');
z-index: 1;
}

Expand Down Expand Up @@ -108,8 +108,8 @@
content: '';
display: block;
position: absolute;
top: -($on-sale-dot-size / 2);
right: -($on-sale-dot-size / 2);
top: calc(-1 * $on-sale-dot-size / 2);
right: calc(-1 * $on-sale-dot-size / 2);
width: $on-sale-dot-size;
height: $on-sale-dot-size;
border-radius: 50%;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Divider/Divider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
&:before,
&:after {
$space-between-lines: 0.175rem;
$offset: $space-between-lines/2;
$offset: calc($space-between-lines / 2);
transform: translateY(calc(-#{$offset}));
background-color: color(ink);
box-shadow: 0 $space-between-lines 0 0 color(ink);
Expand Down
6 changes: 3 additions & 3 deletions src/components/Expandable/Expandable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@

&--dark-background {
border-color: color(cement);
color: color(snow);
color: color('snow');

#{$self}__name {
&::before,
&::after {
background-color: color(snow);
background-color: color('snow');
}
}

#{$self}__contents {
color: color(snow);
color: color('snow');
}
}
}
2 changes: 1 addition & 1 deletion src/components/LoadingShapes/LoadingShapes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.LoadingShapes__item--current {
// stylelint-disable-next-line plugin/selector-bem-pattern
path {
fill: color(snow);
fill: color('snow');
transition: fill 1s;
}
}
8 changes: 4 additions & 4 deletions src/components/Popover/Popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
.Popover {
$self: &;
$caret-size: space(2);
$border-width: 1rem / 16;
$border-width: calc(1rem / 16);
$offset: space(2);

position: relative;

&__content {
position: absolute;
background-color: color(snow);
background-color: color('snow');
border: $border-width solid color(elephant);
z-index: 1;

Expand Down Expand Up @@ -119,7 +119,7 @@
top: auto;
bottom: -($border-width + $offset);
border-top: none;
border-bottom: $caret-size solid color(snow);
border-bottom: $caret-size solid color('snow');
}

&:before {
Expand All @@ -137,7 +137,7 @@
&:before {
top: -($border-width + $offset);
bottom: auto;
border-top: $caret-size solid color(snow);
border-top: $caret-size solid color('snow');
border-bottom: none;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/RadioButton/RadioButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
flex-shrink: 0;
border: 1px solid;
border-radius: 50%;
background-color: color(snow);
background-color: color('snow');

&--checked {
background-color: color(ink);
Expand All @@ -33,14 +33,14 @@
bottom: $radio-button-check-offset;
left: $radio-button-check-offset;
border-radius: 50%;
background-color: color(snow);
background-color: color('snow');
}
}

&--disabled {
color: color(elephant);
pointer-events: none;
background-color: color(snow);
background-color: color('snow');
&::after {
background-color: color(elephant);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Select/Select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
&:hover,
&:focus {
border-color: color(elephant);
background-color: color(snow);
background-color: color('snow');
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Select/SelectOption.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
cursor: default;

&:hover {
background-color: color(snow);
background-color: color('snow');
}
}
}
2 changes: 1 addition & 1 deletion src/components/Select/SelectOptions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~om';

.SelectOptions {
background-color: color(snow);
background-color: color('snow');
border: 1px solid color(elephant);

&:focus {
Expand Down
2 changes: 1 addition & 1 deletion src/components/SlidingPane/SlidingPane.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
left: 0;
right: 0;
transition: all 500ms ease-out;
background-color: color(snow);
background-color: color('snow');
margin-left: 0;

&--active {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Toast/Toast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~om';

.Toast {
color: color(snow);
color: color('snow');
padding: spacing(3);

&--success {
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/input-styles/_input-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
width: 100%;
padding: spacing(3, 4);
border: 1px solid color(elephant);
background-color: color(snow);
background-color: color('snow');
border-radius: 0;

&::placeholder {
Expand Down
Loading