mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

pull/229/head
kibigo! 2017-11-21 18:17:38 -08:00
parent bdbbd06dad
commit 8812bab687
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/themes/win95/theme.yml
View File

@ -13,11 +13,6 @@ pack:
stylesheet: true stylesheet: true
# All unspecified packs will inherit from glitch. # All unspecified packs will inherit from glitch.
# By default, the glitch preloads will also be used here. You can
# disable them by setting `preload` to `null`.
# preload:
# The `fallback` parameter tells us to use glitch files for everything # The `fallback` parameter tells us to use glitch files for everything
# we haven't specified. # we haven't specified.
fallback: glitch fallback: glitch

3
app/views/layouts/embedded.html.haml
View File

@ -4,8 +4,7 @@
%meta{ charset: 'utf-8' }/ %meta{ charset: 'utf-8' }/
%meta{ name: 'robots', content: 'noindex' }/ %meta{ name: 'robots', content: 'noindex' }/
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'embed', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @core
= render partial: 'layouts/theme', object: @theme = render partial: 'layouts/theme', object: @theme

2
config/webpack/configuration.js
View File

@ -28,7 +28,7 @@ for (let i = 0; i < themeFiles.length; i++) {
if (!data.pack_directory) { if (!data.pack_directory) {
data.pack_directory = dirname(themeFile); data.pack_directory = dirname(themeFile);
} }
if (data.pack) { if (data.pack && typeof data.pack == 'object') {
themes[data.name] = data; themes[data.name] = data;
} }
} }