Merge pull request #162 from jochenkrattenmacher/master

core_theme now only affects whether standard css is loaded
GenieFramework · Jun 14, 2024 · 8f376d6 · 8f376d6
2 parents 8259f8e + 9604071
commit 8f376d6
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Stipple.jl b/src/Stipple.jl
@@ -793,8 +793,9 @@ Registers the `routes` for all the required JavaScript dependencies (scripts).
 
 function deps_routes(channel::String = Stipple.channel_js_name; core_theme::Bool = true) :: Nothing
   if ! Genie.Assets.external_assets(assets_config)
-
-    Genie.Assets.add_fileroute(assets_config, "stipplecore.css"; basedir = normpath(joinpath(@__DIR__, "..")))
+    if core_theme
+      Genie.Assets.add_fileroute(assets_config, "stipplecore.css"; basedir = normpath(joinpath(@__DIR__, "..")))
+    end
 
     if is_channels_webtransport()
       Genie.Assets.channels_route(Genie.Assets.jsliteral(channel))
@@ -807,9 +808,7 @@ function deps_routes(channel::String = Stipple.channel_js_name; core_theme::Bool
     VUEJS = Genie.Configuration.isprod() ? "vue.global.prod.js" : "vue.global.js"
     Genie.Assets.add_fileroute(assets_config, VUEJS; basedir = normpath(joinpath(@__DIR__, "..")))
 
-    if core_theme
-      Genie.Assets.add_fileroute(assets_config, "stipplecore.js"; basedir = normpath(joinpath(@__DIR__, "..")))
-    end
+    Genie.Assets.add_fileroute(assets_config, "stipplecore.js"; basedir = normpath(joinpath(@__DIR__, "..")))
 
     Genie.Assets.add_fileroute(assets_config, "vue_filters.js"; basedir = normpath(joinpath(@__DIR__, "..")))
     Genie.Assets.add_fileroute(assets_config, "watchers.js"; basedir = normpath(joinpath(@__DIR__, "..")))