Skip to content

Commit de69327

Browse files
BeyondMagicBeyondMagic
committed
fix(dev): remove deprecated modules, change node-sass to sass
1 parent 4a0f47c commit de69327

18 files changed

+4718
-3709
lines changed

‎dev/scss/base/_scaffholding.scss

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "../utilities/variables" as v;
2+
13
body {
24

35
margin: 0 auto;
@@ -11,25 +13,25 @@ html {
1113

1214
&.nightmode {
1315

14-
--body-background: #{$dark};
15-
--body-background-lighter: #{$dark-l1};
16-
--body-background-darker: #{$dark-s1};
16+
--body-background: v.$dark;
17+
--body-background-lighter: v.$dark-l1;
18+
--body-background-darker: v.$dark-s1;
1719

18-
--font-colour: #{$light};
20+
--font-colour: v.$light;
1921

20-
--card-shadow: #{$inverted-shadow};
22+
--card-shadow: v.$inverted-shadow;
2123

2224
}
2325

2426
&.daymode {
2527

26-
--body-background: #{$light};
27-
--body-background-lighter: #{$light-l1};
28-
--body-background-darker: #{$light-s1};
28+
--body-background: v.$light;
29+
--body-background-lighter: v.$light-l1;
30+
--body-background-darker: v.$light-s1;
2931

30-
--font-colour: #{$dark};
32+
--font-colour: v.$dark;
3133

32-
--card-shadow: #{$shadow};
34+
--card-shadow: v.$shadow;
3335

3436
}
3537

‎dev/scss/base/_typography.scss

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
@use '../utilities/variables' as v;
2+
13
:root { font-size: 62.5%; }
24

35

46

57
body {
68

7-
font-family: $font-family, $font-stack;
8-
font-size: $font-size;
9-
font-weight: $font-weight-regular;
10-
line-height: $line-height;
9+
font-family: v.$font-family, v.$font-stack;
10+
font-size: v.$font-size;
11+
font-weight: v.$font-weight-regular;
12+
line-height: v.$line-height;
1113
color: var(--font-colour);
1214

1315
}
@@ -30,29 +32,29 @@ a {
3032

3133

3234
h1, h2, h3, h4,
33-
strong { font-weight: $font-weight-bold; }
35+
strong { font-weight: v.$font-weight-bold; }
3436

3537
h1 {
3638

37-
margin: 0 0 $space-l 0;
39+
margin: 0 0 v.$space-l 0;
3840

39-
font-size: $font-size-xl;
41+
font-size: v.$font-size-xl;
4042

4143
}
4244

4345
h2 {
4446

45-
margin: $space-xl 0 $space-l 0;
47+
margin: v.$space-xl 0 v.$space-l 0;
4648

47-
font-size: $font-size-l;
49+
font-size: v.$font-size-l;
4850

4951
}
5052

5153
h3 {
5254

53-
margin: $space-l 0 $space-m 0;
55+
margin: v.$space-l 0 v.$space-m 0;
5456

55-
font-size: $font-size;
57+
font-size: v.$font-size;
5658

5759
}
5860

@@ -61,6 +63,6 @@ h3 {
6163
em { font-style: italic; }
6264

6365

64-
ul, ol { margin-left: $space-xl; }
66+
ul, ol { margin-left: v.$space-xl; }
6567
ul { list-style-type: '— '; }
6668
ol { list-style-type: upper-roman; }

‎dev/scss/components/_buttons.scss

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
@use '../utilities/variables' as v;
2+
13
.btn {
24

3-
padding: $space-m $space-l;
5+
padding: v.$space-m v.$space-l;
46

5-
border-radius: $border-radius;
7+
border-radius: v.$border-radius;
68
border: none;
79
background: var(--body-background);
8-
box-shadow: $shadow;
10+
box-shadow: v.$shadow;
911

10-
font-size: $font-size;
11-
line-height: $line-height;
12+
font-size: v.$font-size;
13+
line-height: v.$line-height;
1214
color: var(--font-colour);
1315

1416

‎dev/scss/components/_card.scss

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../utilities/variables' as v;
2+
13
.card {
24

35
--linkc: var(--font-colour);
@@ -7,7 +9,7 @@
79

810
display: flex; flex-direction: column;
911

10-
border-radius: $border-radius;
12+
border-radius: v.$border-radius;
1113
background: var(--body-background-lighter);
1214
box-shadow: var(--card-shadow);
1315

@@ -16,13 +18,13 @@
1618

1719
header {
1820

19-
padding: 0 $space-m;
21+
padding: 0 v.$space-m;
2022

2123
display: flex;
2224
align-items: center; justify-content: space-between;
2325

2426

25-
h3 { margin: $space-m 0; padding: 0; }
27+
h3 { margin: v.$space-m 0; padding: 0; }
2628

2729
}
2830

@@ -34,7 +36,7 @@
3436
width: 100%;
3537
padding-top: 75%;
3638

37-
border-radius: $border-radius;
39+
border-radius: v.$border-radius;
3840
background: var(--body-background-darker);
3941

4042
overflow: hidden;
@@ -65,10 +67,10 @@
6567
position: absolute;
6668
top: 0; left: 0;
6769

68-
margin: 0; padding: 0 $space-m $space-m $space-m;
69-
width: calc(100% - #{$space-m * 2});
70+
margin: 0; padding: 0 v.$space-m v.$space-m v.$space-m;
71+
width: calc(100% - #{v.$space-m * 2});
7072

71-
border-radius: $border-radius;
73+
border-radius: v.$border-radius;
7274
background: var(--body-background-lighter);
7375

7476
transform: translateY(-100%);
@@ -86,7 +88,7 @@
8688
position: absolute;
8789
right: 0; bottom: 0;
8890

89-
padding: $space-m;
91+
padding: v.$space-m;
9092

9193
opacity: 0;
9294

‎dev/scss/components/_forms.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
@use '../utilities/variables' as v;
2+
13
input,
24
.btn-submit {
35

4-
padding: $space-s $space-m;
6+
padding: v.$space-s v.$space-m;
57

6-
border-radius: $border-radius-small;
8+
border-radius: v.$border-radius-small;
79
border: 1px solid var(--body-background-darker);
810
background: var(--body-background-lighter);
911

‎dev/scss/components/_lightbox.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use '../utilities/variables' as v;
2+
13
#lightbox {
24

35
display: flex; flex-direction: column;
@@ -16,7 +18,7 @@
1618

1719
max-width: 90vw; max-height: 80vh;
1820

19-
border-radius: $border-radius;
21+
border-radius: v.$border-radius;
2022
border: 1px solid var(--body-background-darker);
2123
background: var(--body-background-darker);
2224

@@ -26,7 +28,7 @@
2628
.btn-close-lightbox {
2729

2830
position: absolute;
29-
top: $space-l; right: $space-l;
31+
top: v.$space-l; right: v.$space-l;
3032

3133
display: block;
3234

‎dev/scss/components/_main-nav.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
@use '../utilities/variables' as v;
2+
13
#main_nav {
24

3-
display: flex; gap: $space-l;
5+
display: flex; gap: v.$space-l;
46
align-items: center;
57

68
--linkc: var(--font-colour);

‎dev/scss/fonts.css

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/* cyrillic */
2+
@font-face {
3+
font-family: 'Jost';
4+
font-style: italic;
5+
font-weight: 400;
6+
font-display: swap;
7+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt5D4hTxM.woff2) format('woff2');
8+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
9+
}
10+
/* latin-ext */
11+
@font-face {
12+
font-family: 'Jost';
13+
font-style: italic;
14+
font-weight: 400;
15+
font-display: swap;
16+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt7j4hTxM.woff2) format('woff2');
17+
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
18+
}
19+
/* latin */
20+
@font-face {
21+
font-family: 'Jost';
22+
font-style: italic;
23+
font-weight: 400;
24+
font-display: swap;
25+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt4D4h.woff2) format('woff2');
26+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
27+
}
28+
/* cyrillic */
29+
@font-face {
30+
font-family: 'Jost';
31+
font-style: italic;
32+
font-weight: 600;
33+
font-display: swap;
34+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt5D4hTxM.woff2) format('woff2');
35+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
36+
}
37+
/* latin-ext */
38+
@font-face {
39+
font-family: 'Jost';
40+
font-style: italic;
41+
font-weight: 600;
42+
font-display: swap;
43+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt7j4hTxM.woff2) format('woff2');
44+
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
45+
}
46+
/* latin */
47+
@font-face {
48+
font-family: 'Jost';
49+
font-style: italic;
50+
font-weight: 600;
51+
font-display: swap;
52+
src: url(https://fonts.gstatic.com/s/jost/v18/92zUtBhPNqw73oHt4D4h.woff2) format('woff2');
53+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
54+
}
55+
/* cyrillic */
56+
@font-face {
57+
font-family: 'Jost';
58+
font-style: normal;
59+
font-weight: 400;
60+
font-display: swap;
61+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73oDd4iYl.woff2) format('woff2');
62+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
63+
}
64+
/* latin-ext */
65+
@font-face {
66+
font-family: 'Jost';
67+
font-style: normal;
68+
font-weight: 400;
69+
font-display: swap;
70+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73ord4iYl.woff2) format('woff2');
71+
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
72+
}
73+
/* latin */
74+
@font-face {
75+
font-family: 'Jost';
76+
font-style: normal;
77+
font-weight: 400;
78+
font-display: swap;
79+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73oTd4g.woff2) format('woff2');
80+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
81+
}
82+
/* cyrillic */
83+
@font-face {
84+
font-family: 'Jost';
85+
font-style: normal;
86+
font-weight: 600;
87+
font-display: swap;
88+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73oDd4iYl.woff2) format('woff2');
89+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
90+
}
91+
/* latin-ext */
92+
@font-face {
93+
font-family: 'Jost';
94+
font-style: normal;
95+
font-weight: 600;
96+
font-display: swap;
97+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73ord4iYl.woff2) format('woff2');
98+
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
99+
}
100+
/* latin */
101+
@font-face {
102+
font-family: 'Jost';
103+
font-style: normal;
104+
font-weight: 600;
105+
font-display: swap;
106+
src: url(https://fonts.gstatic.com/s/jost/v18/92zatBhPNqw73oTd4g.woff2) format('woff2');
107+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
108+
}

‎dev/scss/layout/_footer.scss

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
@use '../utilities/variables' as v;
2+
13
#main_footer {
24

35
display: flex; flex-direction: column;
46
align-items: center; justify-content: center;
57

6-
margin: $space-xxl 0; padding: 0 $space-xl;
8+
margin: v.$space-xxl 0; padding: 0 v.$space-xl;
79

810

9-
.linklist a + a { margin-left: $space-l; }
11+
.linklist a + a { margin-left: v.$space-l; }
1012

1113
}
1214

@@ -18,6 +20,6 @@
1820

1921
margin-right: 5px;
2022

21-
font-size: $font-size-l;
23+
font-size: v.$font-size-l;
2224

2325
}

‎dev/scss/layout/_header.scss

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
@use '../utilities/variables' as v;
2+
13
#main_header {
24

35
display: flex; flex-direction: column;
46
align-items: center; justify-content: space-between;
57

6-
margin: $space-xxl 0; padding: 0 $space-xl;
8+
margin: v.$space-xxl 0; padding: 0 v.$space-xl;
79

810

911
@media (min-width: 792px) { flex-direction: row; }
@@ -14,7 +16,7 @@
1416

1517
.header-branding {
1618

17-
font-size: $font-size-l;
18-
font-weight: $font-weight-bold;
19+
font-size: v.$font-size-l;
20+
font-weight: v.$font-weight-bold;
1921

2022
}

0 commit comments

Comments
 (0)