Skip to content

Commit 443333a

Browse files
committed
clean up sass deprecation warnings, migrate to new functionality
1 parent 1498106 commit 443333a

11 files changed

Lines changed: 142 additions & 96 deletions

File tree

assets/css/main.scss

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
---
22
---
3+
34
@charset "utf-8";
45

5-
@import 'vendors/normalize';
6+
@use "../sass/vendors/normalize";
67

7-
@import 'base/variables';
8-
@import 'base/typography';
9-
@import 'base/base';
10-
@import 'base/mixins';
8+
@use "../sass/base/typography";
9+
@use "../sass/base/base";
1110

12-
@import 'layout/grid';
13-
@import 'layout/header';
14-
@import 'layout/header_mobile';
11+
@use "../sass/layout/grid";
12+
@use "../sass/layout/header";
13+
@use "../sass/layout/header_mobile";
1514

16-
@import 'pages/home';
17-
@import 'pages/common';
18-
@import 'pages/downloads';
19-
@import 'pages/download';
20-
@import 'pages/awesome';
21-
@import 'pages/libraries';
22-
@import 'pages/contributing';
23-
@import 'pages/espinstaller';
15+
@use "../sass/pages/home";
16+
@use "../sass/pages/common";
17+
@use "../sass/pages/downloads";
18+
@use "../sass/pages/download";
19+
@use "../sass/pages/awesome";
20+
@use "../sass/pages/libraries";
21+
@use "../sass/pages/contributing";
22+
@use "../sass/pages/espinstaller";

assets/sass/base/_base.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "variables";
2+
13
body {
24
font-family: "Proxima Nova", "Montserrat", "Lucida Grande",
35
"Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
@@ -32,7 +34,7 @@ a.purple-button-link {
3234
color: #fff;
3335
border-radius: 5px;
3436
border: none;
35-
background-color: $purple;
37+
background-color: variables.$purple;
3638

3739
i {
3840
padding-left: 10px;

assets/sass/base/_mixins.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use "sass:color";
2+
@use "variables";
23

34
@mixin readable-content {
45
display: grid;
@@ -19,11 +20,15 @@
1920
color: #fff;
2021
font-weight: 500;
2122
border-radius: 10px;
22-
background-color: #63338f;
23+
background-color: variables.$purple;
2324

2425
&:hover {
2526
color: #fff;
26-
background-color: color.adjust(#63338f, $lightness: -10%, $space: hsl);
27+
background-color: color.adjust(
28+
variables.$purple,
29+
$lightness: -10%,
30+
$space: hsl
31+
);
2732
}
2833
}
2934

assets/sass/layout/_header.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
@use "../base/mixins";
2+
@use "../base/variables";
3+
14
#site-header {
25
display: grid;
36
grid-template-rows: 40px 1fr;
47
grid-column: full;
58

69
.wrapper {
7-
@include readable-content;
10+
@include mixins.readable-content;
811
}
912

1013
.content {
@@ -22,8 +25,8 @@
2225
}
2326

2427
.top-navigation {
25-
@include readable-content;
2628
background-color: #333;
29+
@include mixins.readable-content;
2730

2831
.navigation {
2932
margin-left: 15px;
@@ -64,7 +67,7 @@
6467
justify-content: end;
6568

6669
a {
67-
@include rounded-button;
70+
@include mixins.rounded-button;
6871
}
6972
}
7073
}
@@ -97,7 +100,7 @@
97100
}
98101
}
99102

100-
@media (max-width: $screen-xs-max) {
103+
@media (max-width: variables.$screen-xs-max) {
101104
#site-header {
102105
display: none !important;
103106
}

assets/sass/layout/_header_mobile.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "../base/variables";
2+
13
#mobile-header {
24
background-color: #333;
35

@@ -13,7 +15,7 @@
1315
padding: 0;
1416
margin: -1px;
1517
overflow: hidden;
16-
clip: rect(0,0,0,0);
18+
clip: rect(0, 0, 0, 0);
1719
border: 0;
1820
}
1921

@@ -60,9 +62,8 @@
6062
}
6163
}
6264

63-
@media (min-width: $screen-xs-max) {
65+
@media (min-width: variables.$screen-xs-max) {
6466
#mobile-header {
6567
display: none !important;
6668
}
6769
}
68-

assets/sass/pages/_awesome.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1+
@use "../base/variables";
2+
13
#awesome-page {
24
.content {
35
p {
46
margin-bottom: 16px;
57
}
68

79
h2 {
8-
border-bottom: 1px solid $gray-border;
9-
padding-bottom: .3em;
10+
border-bottom: 1px solid variables.$gray-border;
11+
padding-bottom: 0.3em;
1012
margin-bottom: 16px;
1113
margin-top: 24px;
1214
}
1315

1416
ul {
1517
margin-bottom: 16px;
1618
li {
17-
margin-top: .25em;
19+
margin-top: 0.25em;
1820
}
1921
}
2022
}

assets/sass/pages/_common.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "../base/variables";
2+
13
#common-page {
24
h1 {
35
text-align: center;
@@ -8,18 +10,16 @@
810
}
911

1012
h2 {
11-
border-bottom: 1px solid $gray-border;
12-
padding-bottom: .3em;
13+
border-bottom: 1px solid variables.$gray-border;
14+
padding-bottom: 0.3em;
1315
margin-bottom: 16px;
1416
margin-top: 24px;
1517
}
1618

1719
ul {
1820
margin-bottom: 16px;
1921
li {
20-
margin-top: .25em;
22+
margin-top: 0.25em;
2123
}
2224
}
2325
}
24-
25-

assets/sass/pages/_contributing.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "../base/variables";
2+
13
#contributing-page {
24
.tabbed-navigation {
35
list-style: none;
@@ -15,7 +17,7 @@
1517
text-decoration: none;
1618
padding: 0.5em 0.5em;
1719
font-weight: bold;
18-
border-bottom: 0.5em solid $gray-border;
20+
border-bottom: 0.5em solid variables.$gray-border;
1921

2022
&.active {
2123
border-color: #000;
@@ -24,7 +26,7 @@
2426
}
2527
}
2628

27-
ul.issues-list{
29+
ul.issues-list {
2830
li {
2931
.issue-label {
3032
border-radius: 2em;

0 commit comments

Comments
 (0)