Skip to content

Commit e5fb47e

Browse files
committed
chore(ci): migrate node-sass to dart sass
1 parent 34cc21b commit e5fb47e

18 files changed

+251
-1181
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.20.2
1+
20

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
"lottie-web": "5.12.2",
5454
"mini-css-extract-plugin": "1.6.1",
5555
"mini-svg-data-uri": "1.1.3",
56-
"nanoid": "3.3.3",
57-
"node-sass": "7.0.3",
56+
"nanoid": "^5.1.5",
5857
"normalize.css": "8.0.1",
5958
"postcss-custom-properties": "11.0.0",
6059
"postcss-font-smoothing": "0.1.0",
@@ -71,7 +70,6 @@
7170
"react-swipeable-views": "0.14.0",
7271
"resolve-url-loader": "4.0.0",
7372
"rollup": "2.47.0",
74-
"sass-loader": "12.1.0",
7573
"sha.js": "^2.4.11",
7674
"svgo": "2.7.0",
7775
"svgo-loader": "3.0.0",
@@ -97,6 +95,8 @@
9795
"postcss-import": "15.1.0",
9896
"prettier": "2.6.2",
9997
"react-kotlin-playground": "0.1.0-beta.12",
98+
"sass": "1.89.2",
99+
"sass-loader": "16.0.5",
100100
"start-server-and-test": "1.14.0",
101101
"the-platform": "0.10.1",
102102
"typescript": "4.6.3",

static/css/_kto.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import 'static/js/components/kto-button.scss';
2-
@import 'static/js/components/kto-header.scss';
3-
@import 'static/js/components/kto-numbers.scss';
4-
@import 'static/js/components/kto-qoute/kto-quotes.scss';
5-
@import 'static/js/components/kto-tabs.scss';
6-
@import 'static/js/components/kto-heading.scss';
7-
@import 'static/js/components/kto-text.scss';
8-
@import 'static/js/components/kto-link.scss';
1+
@import '../js/components/kto-button.scss';
2+
@import '../js/components/kto-header.scss';
3+
@import '../js/components/kto-numbers.scss';
4+
@import '../js/components/kto-qoute/kto-quotes.scss';
5+
@import '../js/components/kto-tabs.scss';
6+
@import '../js/components/kto-heading.scss';
7+
@import '../js/components/kto-text.scss';
8+
@import '../js/components/kto-link.scss';

static/css/com/_bits/_code.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99

1010
%code-span {
1111
font-family: $font-family-mono;
12+
}
1213

13-
&%_decorated {
14-
padding: 0 5px;
15-
border-radius: 4px;
16-
background-color: #efefef;
17-
}
14+
%code-span_decorated {
15+
@extend %code-span;
16+
padding: 0 5px;
17+
border-radius: 4px;
18+
background-color: #efefef;
1819
}

static/css/com/_bits/_header.scss

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@
3434
page-break-before: always;
3535
page-break-after: avoid;
3636
}
37+
}
3738

38-
&%_section-title {
39-
padding-top: 140px;
40-
margin-bottom: 45px;
41-
font-size: 55px;
42-
line-height: 65px;
43-
font-weight: bold;
44-
}
39+
40+
%h1_section-title {
41+
padding-top: 140px;
42+
margin-bottom: 45px;
43+
font-size: 55px;
44+
line-height: 65px;
45+
font-weight: bold;
4546
}
4647

4748
%h2 {

static/css/com/_bits/_list.scss

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,47 @@
11
@import '../../_config';
22

3-
%list {
4-
&%ul {
5-
margin-bottom: $vertical-rhythm-unit;
6-
margin-left: $vertical-rhythm-unit*2;
7-
8-
& > li {
9-
margin-bottom: $vertical-rhythm-unit/2;
10-
list-style: none;
11-
12-
&:last-child {
13-
margin-bottom: 0;
14-
}
15-
16-
&:before {
17-
position: absolute;
18-
margin-top: -1px;
19-
margin-left: -20px;
20-
color: #666;
21-
content: '\2014';
22-
}
3+
%list_ul {
4+
margin-bottom: $vertical-rhythm-unit;
5+
margin-left: $vertical-rhythm-unit*2;
6+
7+
& > li {
8+
margin-bottom: $vertical-rhythm-unit/2;
9+
list-style: none;
10+
11+
&:last-child {
12+
margin-bottom: 0;
2313
}
2414

25-
ul,
26-
ol {
27-
margin-top: $vertical-rhythm-unit/2;
15+
&:before {
16+
position: absolute;
17+
margin-top: -1px;
18+
margin-left: -20px;
19+
color: #666;
20+
content: '\2014';
2821
}
2922
}
3023

31-
&%ol {
32-
margin-bottom: $vertical-rhythm-unit;
33-
margin-left: $vertical-rhythm-unit*2;
24+
ul,
25+
ol {
26+
margin-top: $vertical-rhythm-unit/2;
27+
}
28+
}
29+
30+
%list_ol {
31+
margin-bottom: $vertical-rhythm-unit;
32+
margin-left: $vertical-rhythm-unit*2;
3433

35-
& > li {
36-
list-style: decimal;
37-
margin-bottom: $vertical-rhythm-unit/2;
34+
& > li {
35+
list-style: decimal;
36+
margin-bottom: $vertical-rhythm-unit/2;
3837

39-
&:last-child {
40-
margin-bottom: 0;
41-
}
38+
&:last-child {
39+
margin-bottom: 0;
4240
}
41+
}
4342

44-
ul,
45-
ol {
46-
margin-top: $vertical-rhythm-unit/2;
47-
}
43+
ul,
44+
ol {
45+
margin-top: $vertical-rhythm-unit/2;
4846
}
49-
}
47+
}

static/css/com/_page-content/_page-content.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ h5 {
3838

3939
// list
4040
ul {
41-
@extend %list%ul;
41+
@extend %list_ul;
4242
line-height: 24px;
4343
}
4444

4545
ol {
46-
@extend %list%ol;
46+
@extend %list_ol;
4747
line-height: 24px;
4848
}
4949

@@ -78,7 +78,7 @@ code {
7878
.multi-language-span > code,
7979
p > code,
8080
li > code {
81-
@extend %code-span%_decorated;
81+
@extend %code-span_decorated;
8282
}
8383

8484
.code._highlighted {

static/css/com/page-content/page-content.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
.section-title {
66
@extend %h1;
7-
@extend %h1%_section-title;
7+
@extend %h1_section-title;
88
}
99

1010
.page-title {

static/css/playgrounds.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import './static/css/_config';
1+
@import '_config';
22

33
.CodeMirror,
44
.CodeMirror pre,

static/js/components/kto-button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ a.kto-button:hover, a.kto-button:focus, a.kto-button:active {
317317
}
318318
}
319319

320-
@import "static/js/components/kto-text";
320+
@import "../../js/components/kto-text";
321321

322322
.page_restyled_v2 .kto-button_size_l {
323323
@include kto-text;

0 commit comments

Comments
 (0)