Skip to content

Commit 9e6c500

Browse files
committed
re-add no-invalid-position-at-import-rule
1 parent bf0c014 commit 9e6c500

5 files changed

Lines changed: 36 additions & 24 deletions

File tree

frontend/src/styles/fontawesome-5.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
@import "@fortawesome/fontawesome-free/scss/_mixins.scss";
33
@import "@fortawesome/fontawesome-free/scss/_core.scss";
44

5-
/** fixed-with **/
5+
/** fixed-width **/
66
@import "@fortawesome/fontawesome-free/scss/_fixed-width.scss"; //fa-fw
77
/** animated **/
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";
1113

1214
@font-face {
1315
font-family: "Font Awesome";
@@ -57,5 +59,3 @@
5759
src: url("/webfonts-generated/fa-brands-400.woff2") format("woff2");
5860
}
5961
}
60-
61-
@import "@fortawesome/fontawesome-free/scss/_icons.scss";

frontend/src/styles/index.scss

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
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+
122
@layer hidden {
223
// custom layer to hide elements without using !important
324
// (as long as this layer is higher than custom-styles)
@@ -16,11 +37,6 @@
1637
}
1738

1839
@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-
2440
.chartCanvas {
2541
width: 100% !important;
2642
}

frontend/src/styles/media-queries.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
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+
110
body {
211
&.mediaQueryDebugLevel1 {
312
.content-grid {
@@ -14,15 +23,6 @@ body {
1423
}
1524
}
1625

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

stylelint.config.mjs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
export default {
33
extends: ["stylelint-config-standard-scss"],
44
rules: {
5-
"no-invalid-position-at-import-rule": null, // consider adding // default: [true, {ignoreAtRules: ['use', 'forward'],},]
6-
75
"font-family-no-missing-generic-family-keyword": [
86
true,
97
{ ignoreFontFamilies: ["Font Awesome", "Font Awesome Brands"] },

0 commit comments

Comments
 (0)