Merge remote-tracking branch 'origin/better-themeing' into merging-upstream

2017-09-28 09:20:59 +02:00
parent 83bda6c1a8 f7ca205f38
commit daad07b1d5
25 changed files with 116 additions and 52 deletions
--- 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,