Merge branch 'master' into feature/fix-css-preload

monkeytypegame · Feb 4, 2025 · 26faa24 · 26faa24
2 parents f2ad6d4 + a4b6c17
commit 26faa24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
@@ -1,5 +1,4 @@
-@import "normalize.css", "fontawesome-5", "buttons", "fonts", "404", "ads",
-  "about", "account", "animations", "banners", "caret", "commandline", "core",
-  "footer", "inputs", "keymap", "leaderboards", "login", "monkey", "nav",
-  "notifications", "popups", "profile", "scroll", "settings", "account-settings",
-  "test", "media-queries";
+@import "buttons", "fonts", "404", "ads", "about", "account", "animations",
+  "banners", "caret", "commandline", "core", "footer", "inputs", "keymap",
+  "leaderboards", "login", "monkey", "nav", "notifications", "popups", "profile",
+  "scroll", "settings", "account-settings", "test", "media-queries";
diff --git a/frontend/src/styles/vendor.scss b/frontend/src/styles/vendor.scss
@@ -1,2 +1,4 @@
+@import "normalize.css";
+@import "fontawesome-5";
 @import "slim-select/styles";
 @import "balloon-css/src/balloon";