about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-11-30 19:29:47 -0800
committerkibigo! <marrus-sh@users.noreply.github.com>2017-11-30 19:29:47 -0800
commit541fe9b110fce15c42ba15df27926552c234afd0 (patch)
treef4c0a74cb87d4d40ca44e99f1825fa9cd47edf96 /app/views/layouts
parent8812bab6875024f76c59ab43d1dd3717e5e6da68 (diff)
Skins support
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_theme.html.haml7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/layouts/_theme.html.haml b/app/views/layouts/_theme.html.haml
index cdec4b370..941ccc914 100644
--- a/app/views/layouts/_theme.html.haml
+++ b/app/views/layouts/_theme.html.haml
@@ -3,8 +3,11 @@
     = render partial: 'layouts/theme', object: theme[:common]
   - if theme[:pack]
     = javascript_pack_tag theme[:name] ? "themes/#{theme[:name]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, crossorigin: 'anonymous'
-    - if theme[:stylesheet]
-      = stylesheet_pack_tag theme[:name] ? "themes/#{theme[:name]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, media: 'all'
+    - if theme[:skin]
+      - if !theme[:name] || theme[:skin] == 'default'
+        = stylesheet_pack_tag theme[:name] ? "themes/#{theme[:name]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, media: 'all'
+      - else
+        = stylesheet_pack_tag "skins/#{theme[:name]}/#{theme[:skin]}/#{theme[:pack]}"
     - if theme[:preload]
       - theme[:preload].each do |link|
         %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/