Skip to content

Commit ded8e26

Browse files
committed
Revert "re-add no-invalid-position-at-import-rule"
This reverts commit 9e6c500.
1 parent 3dbeff5 commit ded8e26

5 files changed

Lines changed: 23 additions & 35 deletions

File tree

frontend/src/styles/fontawesome-5.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
@import "@fortawesome/fontawesome-free/scss/_animated.scss"; //fa-spin
99
/** rotated **/
1010
@import "@fortawesome/fontawesome-free/scss/_rotated-flipped.scss"; //fa-rotate-90
11-
/** icons **/
12-
@import "@fortawesome/fontawesome-free/scss/_icons.scss";
1311

1412
@font-face {
1513
font-family: "Font Awesome";
@@ -59,3 +57,5 @@
5957
src: url("/webfonts-generated/fa-brands-400.woff2") format("woff2");
6058
}
6159
}
60+
61+
@import "@fortawesome/fontawesome-free/scss/_icons.scss";

frontend/src/styles/index.scss

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
@import "buttons" layer(custom-styles);
2-
@import "404" layer(custom-styles);
3-
@import "ads" layer(custom-styles);
4-
@import "account" layer(custom-styles);
5-
@import "animations" layer(custom-styles);
6-
@import "caret" layer(custom-styles);
7-
@import "commandline" layer(custom-styles);
8-
@import "core" layer(custom-styles);
9-
@import "fonts" layer(custom-styles);
10-
@import "inputs" layer(custom-styles);
11-
@import "keymap" layer(custom-styles);
12-
@import "monkey" layer(custom-styles);
13-
@import "popups" layer(custom-styles);
14-
@import "scroll" layer(custom-styles);
15-
@import "settings" layer(custom-styles);
16-
@import "account-settings" layer(custom-styles);
17-
@import "test" layer(custom-styles);
18-
@import "loading" layer(custom-styles);
19-
@import "friends" layer(custom-styles);
20-
@import "media-queries" layer(custom-styles);
21-
221
@layer hidden {
232
// custom layer to hide elements without using !important
243
// (as long as this layer is higher than custom-styles)
@@ -37,6 +16,11 @@
3716
}
3817

3918
@layer custom-styles {
19+
@import "buttons", "404", "ads", "account", "animations", "caret",
20+
"commandline", "core", "fonts", "inputs", "keymap", "monkey", "popups",
21+
"scroll", "settings", "account-settings", "test", "loading", "friends",
22+
"media-queries";
23+
4024
.chartCanvas {
4125
width: 100% !important;
4226
}

frontend/src/styles/media-queries.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
//media queries based on tailwind breakpoints https://tailwindcss.com/docs/container
2-
@import "media-queries-orange";
3-
@import "media-queries-yellow";
4-
@import "media-queries-green";
5-
@import "media-queries-blue";
6-
@import "media-queries-purple";
7-
@import "media-queries-brown";
8-
@import "media-queries-gray";
9-
101
body {
112
&.mediaQueryDebugLevel1 {
123
.content-grid {
@@ -23,6 +14,15 @@ body {
2314
}
2415
}
2516

17+
//media queries based on tailwind breakpoints https://tailwindcss.com/docs/container
18+
@import "media-queries-orange";
19+
@import "media-queries-yellow";
20+
@import "media-queries-green";
21+
@import "media-queries-blue";
22+
@import "media-queries-purple";
23+
@import "media-queries-brown";
24+
@import "media-queries-gray";
25+
2626
@media only screen and (max-width: 1875px) {
2727
.ad.ad-v {
2828
display: none;

frontend/src/styles/vendor.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import "normalize.css" layer(normalize);
2-
@import "fontawesome-5" layer(vendor);
3-
@import "slim-select/styles" layer(vendor);
4-
@import "balloon-css/src/balloon" layer(vendor);
2+
@layer vendor {
3+
@import "fontawesome-5";
4+
@import "slim-select/styles";
5+
@import "balloon-css/src/balloon";
6+
}

stylelint.config.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ export default {
5757
files: ["**/*.scss"],
5858
extends: ["stylelint-config-standard-scss"],
5959
rules: {
60+
"no-invalid-position-at-import-rule": null, // consider adding // default: [true, {ignoreAtRules: ['use', 'forward'],},]
61+
6062
"at-rule-no-unknown": null, // use "scss/at-rule-no-unknown" to override this
6163

6264
"scss/at-extend-no-missing-placeholder": null,

0 commit comments

Comments
 (0)