Refactor theming HAML template a bit

rebase/4.0.0rc2
Claire 2022-01-16 22:03:43 +01:00
parent 1b386c881c
commit c789bcc844
1 changed files with 3 additions and 2 deletions

View File

@ -2,10 +2,11 @@
- if theme[:pack] != 'common' && theme[:common] - if theme[:pack] != 'common' && theme[:common]
= render partial: 'layouts/theme', object: theme[:common] = render partial: 'layouts/theme', object: theme[:common]
- if theme[:pack] - if theme[:pack]
= javascript_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", crossorigin: 'anonymous' - pack_path = theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}"
= javascript_pack_tag pack_path, crossorigin: 'anonymous'
- if theme[:skin] - if theme[:skin]
- if !theme[:flavour] || theme[:skin] == 'default' - if !theme[:flavour] || theme[:skin] == 'default'
= stylesheet_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous' = stylesheet_pack_tag pack_path, media: 'all', crossorigin: 'anonymous'
- else - else
= stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", crossorigin: 'anonymous' = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", crossorigin: 'anonymous'
- if theme[:preload] - if theme[:preload]