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