Skip to content

Commit 1d84cc8

Browse files
authored
fix: replace deprecated darken/lighten scss functions (#891)
1 parent d587968 commit 1d84cc8

File tree

5 files changed

+31
-28
lines changed

5 files changed

+31
-28
lines changed

src/sass/_asciidoc.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@each $name, $color in $hint-colors {
33
&.#{$name} {
44
border-left-color: $color;
5-
background-color: scale-color($color, $lightness: 95%, $saturation: -30%);
5+
background-color: color.scale($color, $lightness: 95%, $saturation: -30%);
66
color: $body-font-color;
77
}
88
}
@@ -28,7 +28,7 @@
2828
padding: $padding-4 $padding-16 !important;
2929

3030
&:first-child {
31-
background-color: scale-color($gray-600, $alpha: -95%);
31+
background-color: color.scale($gray-600, $alpha: -95%);
3232
font-weight: bold;
3333

3434
&.icon {

src/sass/_color_mode.scss

+19-19
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
--mark-color: #{$mark-color};
99

10-
--button-background: #{lighten($main-color, 2)};
10+
--button-background: #{color.scale($main-color, $lightness: 15%)};
1111
--button-border-color: #{$main-color};
1212

1313
--link-color: #{$link-color};
@@ -20,7 +20,7 @@
2020
--accent-color: #{$gray-200};
2121
--accent-color-lite: #{$gray-100};
2222

23-
--control-icons: #{lighten($body-font-color, 50)};
23+
--control-icons: #{color.scale($body-font-color, $lightness: 40%)};
2424

2525
--footer-background: #{$second-color};
2626
--footer-font-color: #{$white};
@@ -42,7 +42,7 @@
4242

4343
.gdoc-hint__title,
4444
.admonitionblock table td:first-child {
45-
background-color: scale-color($gray-600, $alpha: -95%);
45+
background-color: color.scale($gray-600, $alpha: -95%);
4646
}
4747
}
4848
}
@@ -52,11 +52,11 @@
5252
--header-font-color: #{$white};
5353

5454
--body-background: #{$body-background-dark};
55-
--body-font-color: #{lighten($body-background-dark, 60)};
55+
--body-font-color: #{color.scale($body-background-dark, $lightness: 70%)};
5656

5757
--mark-color: #{$mark-color};
5858

59-
--button-background: #{lighten($main-color, 2)};
59+
--button-background: #{color.scale($main-color, $lightness: 15%)};
6060
--button-border-color: #{$main-color};
6161

6262
--link-color: #{$link-color-dark};
@@ -65,11 +65,11 @@
6565
--hint-link-color: #{$link-color};
6666
--hint-link-color-visited: #{$link-color-visited};
6767

68-
--accent-color-dark: #{darken($body-background-dark, 8)};
69-
--accent-color: #{darken($body-background-dark, 4)};
70-
--accent-color-lite: #{darken($body-background-dark, 2)};
68+
--accent-color-dark: #{color.scale($body-background-dark, $lightness: -60%)};
69+
--accent-color: #{color.scale($body-background-dark, $lightness: -30%)};
70+
--accent-color-lite: #{color.scale($body-background-dark, $lightness: -15%)};
7171

72-
--control-icons: #{lighten($body-font-color, 50)};
72+
--control-icons: #{color.scale($body-font-color, $lightness: 40%)};
7373

7474
--footer-background: #{$second-color};
7575
--footer-font-color: #{$white};
@@ -102,7 +102,7 @@
102102

103103
.gdoc-hint__title,
104104
.admonitionblock table td:first-child {
105-
background-color: scale-color($gray-600, $alpha: -85%);
105+
background-color: color.scale($gray-600, $alpha: -85%);
106106
}
107107
}
108108
}
@@ -112,14 +112,14 @@
112112

113113
& {
114114
--code-background: #{$code-background-dark};
115-
--code-accent-color: #{darken($code-background-dark, 4)};
116-
--code-accent-color-lite: #{darken($code-background-dark, 2)};
115+
--code-accent-color: #{color.scale($code-background-dark, $lightness: -30%)};
116+
--code-accent-color-lite: #{color.scale($code-background-dark, $lightness: -15%)};
117117
--code-font-color: #{$code-font-color-dark};
118118

119119
--code-copy-background: #{$code-background-dark};
120-
--code-copy-font-color: #{darken($code-font-color-dark, 15)};
121-
--code-copy-border-color: #{darken($code-font-color-dark, 20)};
122-
--code-copy-success-color: #{scale-color(map.get($hint-colors, "ok"), $alpha: -55%)};
120+
--code-copy-font-color: #{color.scale($code-font-color-dark, $lightness: -15%)};
121+
--code-copy-border-color: #{color.scale($code-font-color-dark, $lightness: -20%)};
122+
--code-copy-success-color: #{color.scale(map.get($hint-colors, "ok"), $alpha: -55%)};
123123
}
124124
}
125125

@@ -128,13 +128,13 @@
128128

129129
& {
130130
--code-background: #{$code-background};
131-
--code-accent-color: #{darken($code-background, 6)};
132-
--code-accent-color-lite: #{darken($code-background, 2)};
131+
--code-accent-color: #{color.scale($code-background, $lightness: -45%)};
132+
--code-accent-color-lite: #{color.scale($code-background, $lightness: -15%)};
133133
--code-font-color: #{$code-font-color};
134134

135135
--code-copy-background: #{$code-background};
136-
--code-copy-font-color: #{lighten($code-font-color, 15)};
137-
--code-copy-border-color: #{lighten($code-font-color, 20)};
136+
--code-copy-font-color: #{color.scale($code-font-color, $lightness: 20%)};
137+
--code-copy-border-color: #{color.scale($code-font-color, $lightness: 40%)};
138138
--code-copy-success-color: #{map.get($hint-colors, "ok")};
139139
}
140140
}

src/sass/_defaults.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "sass:color";
2+
13
// Used in layout
24
$padding-2: 0.125rem !default;
35
$padding-4: 0.25rem !default;
@@ -68,7 +70,7 @@ $link-color-dark: rgba(110, 168, 212, 1) !default;
6870
$link-color-visited-dark: rgba(186, 142, 240) !default;
6971

7072
$code-background: $gray-100 !default;
71-
$code-background-dark: darken($body-background-dark, 3) !default;
73+
$code-background-dark: color.scale($body-background-dark, $lightness: -15%) !default;
7274

7375
$header-font-family: "Metropolis", sans-serif !default;
7476
$header-height: 3.5rem !default;

src/sass/_shortcodes.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -140,23 +140,23 @@
140140
@each $name, $color in $hint-colors {
141141
&.#{$name} {
142142
border-left-color: $color;
143-
background-color: scale-color($color, $lightness: 95%, $saturation: -30%);
143+
background-color: color.scale($color, $lightness: 95%, $saturation: -30%);
144144
color: $body-font-color;
145145
padding: 0;
146146

147147
code,
148148
pre {
149-
background-color: scale-color($color, $lightness: 80%, $saturation: -75%);
149+
background-color: color.scale($color, $lightness: 80%, $saturation: -75%);
150150
color: $code-font-color;
151151
}
152152
}
153153
}
154154

155155
&__title {
156156
padding: $padding-4 $padding-16;
157-
background-color: scale-color($gray-600, $alpha: -95%);
157+
background-color: color.scale($gray-600, $alpha: -95%);
158158
font-weight: bold;
159-
color: scale-color($body-font-color, $alpha: -15%);
159+
color: color.scale($body-font-color, $alpha: -15%);
160160

161161
i.fa::after {
162162
content: attr(title);
@@ -226,8 +226,8 @@
226226

227227
@each $name, $color in $hint-colors {
228228
&__tag.#{$name} {
229-
border-color: scale-color($color, $lightness: 90%, $saturation: -30%);
230-
background-color: scale-color($color, $lightness: 95%, $saturation: -30%);
229+
border-color: color.scale($color, $lightness: 90%, $saturation: -30%);
230+
background-color: color.scale($color, $lightness: 95%, $saturation: -30%);
231231
}
232232
}
233233

src/sass/main.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use "sass:map";
22
@use "sass:meta";
3+
@use "sass:color";
34

45
@import "_defaults";
56
@import "_color_mode";

0 commit comments

Comments
 (0)