diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 16:21:20 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 16:21:20 +0100 |
| commit | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f | |
| parent | 47c8707f01d51e292f5009cd1027cbdf10961a0d (diff) | |
Fix settings/flavours
Update theming system to use new paths for media files
| -rw-r--r-- | app/javascript/flavours/glitch/theme.yml | 6 | ||||
| -rw-r--r-- | app/javascript/flavours/vanilla/theme.yml | 6 | ||||
| -rw-r--r-- | app/views/settings/flavours/show.html.haml | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml index d8f313381..587cc0f1e 100644 --- a/app/javascript/flavours/glitch/theme.yml +++ b/app/javascript/flavours/glitch/theme.yml @@ -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]`), diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml index a215b2625..42e26daea 100644 --- a/app/javascript/flavours/vanilla/theme.yml +++ b/app/javascript/flavours/vanilla/theme.yml @@ -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]`), diff --git a/app/views/settings/flavours/show.html.haml b/app/views/settings/flavours/show.html.haml index a5126d9c5..c3f785aa0 100644 --- a/app/views/settings/flavours/show.html.haml +++ b/app/views/settings/flavours/show.html.haml @@ -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: '' |