Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dc2df15

Browse files
lwz322lwz322
committed
Merge remote-tracking branch 'upstream/dev'
2 parents 66e19bc + 2a0d141 commit dc2df15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+999
-517
lines changed

‎_sass/additional/_alert.scss‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
.article__content {
22
p.success {
33
padding: map-get($spacers, 2) map-get($spacers, 3);
4-
background-color: rgba($green, .1);
5-
border: 1px solid $green;
4+
// background-color: rgba($green, .1);
5+
border: 1px solid;
6+
@include css-var(border-color, "var(--green-color)");
67
border-radius: map-get($base, border-radius);
78
}
89

910
p.info {
1011
padding: map-get($spacers, 2) map-get($spacers, 3);
11-
background-color: rgba($blue, .1);
12-
border: 1px solid $blue;
12+
// background-color: rgba($blue, .1);
13+
border: 1px solid;
14+
@include css-var(border-color, "var(--blue-color)");
1315
border-radius: map-get($base, border-radius);
1416
}
1517

1618
p.warning {
1719
padding: map-get($spacers, 2) map-get($spacers, 3);
18-
background-color: rgba($yellow, .1);
19-
border: 1px solid $yellow;
20+
// background-color: rgba($yellow, .1);
21+
border: 1px solid;
22+
@include css-var(border-color, "var(--yellow-color)");
2023
border-radius: map-get($base, border-radius);
2124
}
2225

2326
p.error {
2427
padding: map-get($spacers, 2) map-get($spacers, 3);
25-
background-color: rgba($red, .1);
26-
border: 1px solid $red;
28+
// background-color: rgba($red, .1);
29+
border: 1px solid;
30+
@include css-var(border-color, "var(--red-color)");
2731
border-radius: map-get($base, border-radius);
2832
}
2933
}

‎_sass/additional/_photo-frame.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
}
55

66
img.border, .border > img {
7-
border: 1px solid $border-color-l;
7+
border: 1px solid;
8+
@include css-var(border-color, "var(--border-color-l)");
89
}
910

1011
img.rounded, .rounded > img {

‎_sass/additional/_tag.scss‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
.article__content {
22
code.success {
3-
color: $text-color-function;
4-
background-color: $green;
3+
@include css-var(color, "var(--text-color-function)");
4+
@include css-var(background-color, "var(--green-color)");
55
}
66

77
code.info {
8-
color: $text-color-function;
9-
background-color: $blue;
8+
@include css-var(color, "var(--text-color-function)");
9+
@include css-var(background-color, "var(--blue-color)");
1010
}
1111

1212
code.warning {
13-
color: $text-color-function;
14-
background-color: $yellow;
13+
@include css-var(color, "var(--text-color-function)");
14+
@include css-var(background-color, "var(--yellow-color)");
1515
}
1616

1717
code.error {
18-
color: $text-color-function;
19-
background-color: $red;
18+
@include css-var(color, "var(--text-color-function)");
19+
@include css-var(background-color, "var(--red-color)");
2020
}
2121
}

‎_sass/common/_classes.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* stylelint-disable at-rule-name-space-after, at-rule-semicolon-space-before */
22
@charset "utf-8";
33
@import
4+
"common/classes/var",
5+
46
"common/classes/animation",
57
"common/classes/transform",
68
"common/classes/transition",

‎_sass/common/_function.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,19 @@
1313
$min: map-get($breakpoints, $name);
1414
@return if($min != 0, "#{$name}-", "");
1515
}
16+
17+
/// Replace `$search` with `$replace` in `$string`
18+
/// @author Hugo Giraudel
19+
/// @param {String} $string - Initial string
20+
/// @param {String} $search - Substring to replace
21+
/// @param {String} $replace ('') - New value
22+
/// @return {String} - Updated string
23+
@function str-replace($string, $search, $replace: "") {
24+
$index: str-index($string, $search);
25+
26+
@if $index {
27+
@return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
28+
}
29+
30+
@return $string;
31+
}

‎_sass/common/_properties.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
:root {
2+
@each $name, $value in $default {
3+
--#{$name}: #{$value};
4+
}
5+
}
6+
7+
@media (prefers-color-scheme: dark) {
8+
:root {
9+
@each $name, $value in $dark {
10+
--#{$name}: #{$value};
11+
}
12+
}
13+
}

‎_sass/common/_reset.scss‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ body {
4949
margin: 0;
5050
font: map-get($base, font-weight) #{map-get($base, font-size)}/#{map-get($base, line-height)} map-get($base, font-family);
5151
::-moz-selection {
52-
background: $select-color;
52+
@include css-var(background, "var(--select-color)");
5353
}
5454
::-webkit-selection {
55-
background: $select-color;
55+
@include css-var(background, "var(--select-color)");
5656
}
5757
::selection {
58-
background: $select-color;
58+
@include css-var(background, "var(--select-color)");
5959
}
6060
}
6161

@@ -66,7 +66,7 @@ body {
6666

6767
input, textarea, select, button {
6868
font: map-get($base, font-weight) #{map-get($base, font-size)}/#{map-get($base, line-height)} map-get($base, font-family);
69-
color: $text-color;
69+
@include css-var(color, "var(--text-color)");
7070
}
7171

7272
h1,
@@ -81,55 +81,55 @@ strong {
8181

8282
h1 {
8383
font-size: map-get($base, font-size-h1);
84-
color: $text-color-d;
84+
@include css-var(color, "var(--text-color-d)");
8585
@include media-breakpoint-down(md) {
8686
font-size: map-get($base, font-size-h1-sm);
8787
}
8888
}
8989

9090
h2 {
9191
font-size: map-get($base, font-size-h2);
92-
color: $text-color-d;
92+
@include css-var(color, "var(--text-color-d)");
9393
@include media-breakpoint-down(md) {
9494
font-size: map-get($base, font-size-h2-sm);
9595
}
9696
}
9797

9898
h3 {
9999
font-size: map-get($base, font-size-h3);
100-
color: $text-color-d;
100+
@include css-var(color, "var(--text-color-d)");
101101
@include media-breakpoint-down(md) {
102102
font-size: map-get($base, font-size-h3-sm);
103103
}
104104
}
105105

106106
h4 {
107107
font-size: map-get($base, font-size-h4);
108-
color: $text-color;
108+
@include css-var(color, "var(--text-color)");
109109
@include media-breakpoint-down(md) {
110110
font-size: map-get($base, font-size-h4-sm);
111111
}
112112
}
113113

114114
h5 {
115115
font-size: map-get($base, font-size-h5);
116-
color: $text-color;
116+
@include css-var(color, "var(--text-color)");
117117
@include media-breakpoint-down(md) {
118118
font-size: map-get($base, font-size-h5-sm);
119119
}
120120
}
121121

122122
h6 {
123123
font-size: map-get($base, font-size-h6);
124-
color: $text-color-l;
124+
@include css-var(color, "var(--text-color-l)");
125125
@include media-breakpoint-down(md) {
126126
font-size: map-get($base, font-size-h6-sm);
127127
}
128128
}
129129

130130
a {
131131
font-weight: map-get($base, font-weight-bold);
132-
@include link-colors($main-color-1);
132+
@extend .link, .link--primary;
133133
}
134134

135135
pre, code {

0 commit comments

Comments
 (0)