Fix stylesheets loading

mastodon · Sep 22, 2023 · 5a5328e · 5a5328e
1 parent 2f82d63
commit 5a5328e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js
@@ -1,9 +1,7 @@
 import { start } from '../mastodon/common';
-import { loadLocale } from '../mastodon/load_locale';
+import { loadLocale } from '../mastodon/locales/load_locale';
 import { loadPolyfills } from '../mastodon/polyfills';
 
-import 'styles/application.scss';
-
 start();
 
 loadPolyfills().then(loadLocale).then(async () => {

diff --git a/app/javascript/entrypoints/public.jsx b/app/javascript/entrypoints/public.jsx
@@ -15,7 +15,6 @@ import { loadLocale, getLocale } from '../mastodon/locales';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
-import "styles/application.scss";
 import 'cocoon-js-vanilla';
 
 start();

diff --git a/app/javascript/entrypoints/share.jsx b/app/javascript/entrypoints/share.jsx
@@ -4,8 +4,6 @@ import { start } from '../mastodon/common';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
-import 'styles/application.scss';
-
 start();
 
 async function loaded() {

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -28,7 +28,9 @@
 
     = vite_client_tag
     = vite_react_refresh_tag
-    -# = vite_stylesheet_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = vite_stylesheet_tag "styles/application.scss", extname: false
+    - if current_theme != 'default'
+      = vite_stylesheet_tag "styles/#{current_theme}.scss", media: 'all', crossorigin: 'anonymous'
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }