mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
c790ecb14d
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
64 lines
2.7 KiB
Plaintext
64 lines
2.7 KiB
Plaintext
- content_for :page_title do
|
|
= t('settings.appearance')
|
|
|
|
- content_for :heading_actions do
|
|
= button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
|
|
|
|
= simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
|
|
.fields-group
|
|
= f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
|
|
|
|
- unless I18n.locale == :en
|
|
.flash-message{ style: "text-align: unset; color: unset" }
|
|
#{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: "_blank", rel: "noopener", style: "text-decoration: underline")}
|
|
|
|
%h4= t 'appearance.advanced_web_interface'
|
|
|
|
%p.hint= t 'appearance.advanced_web_interface_hint'
|
|
|
|
.fields-group
|
|
= f.input :setting_advanced_layout, as: :boolean, wrapper: :with_label, hint: false
|
|
|
|
%h4= t 'appearance.animations_and_accessibility'
|
|
|
|
.fields-group
|
|
= f.input :setting_use_pending_items, as: :boolean, wrapper: :with_label
|
|
|
|
.fields-group
|
|
= f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
|
|
= f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_system_emoji_font, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.toot_layout'
|
|
|
|
.fields-group
|
|
= f.input :setting_crop_images, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.discovery'
|
|
|
|
.fields-group
|
|
= f.input :setting_trends, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.confirmation_dialogs'
|
|
|
|
.fields-group
|
|
= f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_favourite_modal, as: :boolean, wrapper: :with_label
|
|
= f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
|
|
|
|
%h4= t 'appearance.sensitive_content'
|
|
|
|
.fields-group
|
|
= f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label
|
|
|
|
.fields-group
|
|
= f.input :setting_use_blurhash, as: :boolean, wrapper: :with_label
|
|
|
|
.fields-group
|
|
= f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
|
|
|
|
.actions
|
|
= f.button :button, t('generic.save_changes'), type: :submit
|