mirror of https://github.com/Siphonay/mastodon
Fix settings/flavours
Update theming system to use new paths for media files
This commit is contained in:
parent
47c8707f01
commit
0fbe90e2d3
|
@ -28,10 +28,8 @@ pack:
|
||||||
locales: locales
|
locales: locales
|
||||||
|
|
||||||
# (OPTIONAL) A file to use as the preview screenshot for the flavour,
|
# (OPTIONAL) A file to use as the preview screenshot for the flavour,
|
||||||
# or an array thereof. These filenames must be unique across all
|
# or an array thereof. These are the full path from `app/javascript/`.
|
||||||
# images (regardless of path), so it's a good idea to namespace them
|
screenshot: flavours/glitch/images/glitch-preview.jpg
|
||||||
# to your theme. It's up to you to let webpack know to compile them.
|
|
||||||
screenshot: glitch-preview.jpg
|
|
||||||
|
|
||||||
# (OPTIONAL) The directory which contains the pack files.
|
# (OPTIONAL) The directory which contains the pack files.
|
||||||
# Defaults to the theme directory (`app/javascript/themes/[theme]`),
|
# Defaults to the theme directory (`app/javascript/themes/[theme]`),
|
||||||
|
|
|
@ -26,10 +26,8 @@ pack:
|
||||||
locales: ../../mastodon/locales
|
locales: ../../mastodon/locales
|
||||||
|
|
||||||
# (OPTIONAL) A file to use as the preview screenshot for the flavour,
|
# (OPTIONAL) A file to use as the preview screenshot for the flavour,
|
||||||
# or an array thereof. These filenames must be unique across all
|
# or an array thereof. These are the full path from `app/javascript/`.
|
||||||
# images (regardless of path), so it's a good idea to namespace them
|
screenshot: images/screenshot.jpg
|
||||||
# to your theme. It's up to you to let webpack know to compile them.
|
|
||||||
screenshot: screenshot.jpg
|
|
||||||
|
|
||||||
# (OPTIONAL) The directory which contains the pack files.
|
# (OPTIONAL) The directory which contains the pack files.
|
||||||
# Defaults to this directory (`app/javascript/flavour/[flavour]`),
|
# Defaults to this directory (`app/javascript/flavour/[flavour]`),
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
= render 'shared/error_messages', object: current_user
|
= render 'shared/error_messages', object: current_user
|
||||||
|
|
||||||
- Themes.instance.flavour(@selected)['screenshot'].each do |screen|
|
- Themes.instance.flavour(@selected)['screenshot'].each do |screen|
|
||||||
%img.flavour-screen{ src: asset_pack_path(screen) }
|
%img.flavour-screen{ src: full_pack_url("media/#{screen}") }
|
||||||
|
|
||||||
.flavour-description
|
.flavour-description
|
||||||
= t "flavours.#{@selected}.description", default: ''
|
= t "flavours.#{@selected}.description", default: ''
|
||||||
|
|
Loading…
Reference in New Issue