diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-09-25 19:24:32 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-09-25 19:24:32 -0700 |
| commit | 86e617a839bd4eb45ace52ab226a4e93bb184ff0 (patch) | |
| tree | 63e4513681af278474c2da1e592a13a6043719b2 /app/views | |
| parent | c2b479efecf1ce1f4a45e626963b7ce7e203b8d6 (diff) | |
Better themeing support!!
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/index.html.haml | 4 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index a13d0702b..3b4219c56 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -2,8 +2,8 @@ %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key} %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json) - = javascript_pack_tag "frontends/#{@frontend}", integrity: true, crossorigin: 'anonymous' - = stylesheet_pack_tag "frontends/#{@frontend}", integrity: true, media: 'all' + = javascript_pack_tag "themes/#{current_theme}", integrity: true, crossorigin: 'anonymous' + = stylesheet_pack_tag "themes/#{current_theme}", integrity: true, media: 'all' .app-holder#mastodon{ data: { props: Oj.dump(default_props) } } %noscript diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index f42f92508..5efd538e4 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -5,6 +5,8 @@ = render 'shared/error_messages', object: current_user .fields-group + = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| safe_join([I18n.t("themes.#{theme}", default: theme)])}, wrapper: :with_label, include_blank: false + = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, |