diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-16 14:07:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 14:07:54 +0200 |
| commit | 35b576dbecfd9e980206189b61efe58fba9269b9 (patch) | |
| tree | 389b6fb15171a84abbeaffcba200b8ea70623392 /app/views/settings/preferences/show.html.haml | |
| parent | 8b0a980e288d3345a731047f638a4619b999fd3a (diff) | |
Improve form for selecting media display preference (#8965)
Regression from #8569
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 608a290e7..d889702fe 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -36,9 +36,11 @@ %hr#settings_web/ - - if Themes.instance.names.size > 1 - .fields-group - = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_block_label, include_blank: false + .fields-row + .fields-group.fields-row__column.fields-row__column-6 + = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false + .fields-group.fields-row__column.fields-row__column-6 + = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false .fields-group = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label @@ -47,7 +49,6 @@ .fields-group = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label - = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_display_media_#{item}"), content_tag(:span, t("simple_form.hints.defaults.setting_display_media_#{item}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label |