diff options
Diffstat (limited to 'app/views')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 15 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 7 |
2 files changed, 17 insertions, 5 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 34c25a7d1..158abc120 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -37,5 +37,20 @@ - if Setting.custom_css.present? = stylesheet_link_tag custom_css_path, media: 'all' + - if current_account&.user&.setting_disable_color + :css + .status__content p > span, + .reply-indicator__content p > span, + .composer--reply > .content p > span, + .account__header__content p > span, + .account__header__fields p > span + { color: inherit !important } + + - if current_account&.user&.setting_hide_captions + :css + div .media-caption, + span .caption + { display: none } + %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index fb9fd204c..d6031d5b8 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -37,14 +37,10 @@ = f.input :setting_rawr_federated, as: :boolean, wrapper: :with_label .fields-group - = f.input :setting_noindex, as: :boolean, wrapper: :with_label - - .fields-group = f.input :setting_hide_network, as: :boolean, wrapper: :with_label = f.input :setting_hide_stats, as: :boolean, wrapper: :with_label - - .fields-group = f.input :setting_show_application, as: :boolean, wrapper: :with_label + = f.input :setting_noindex, as: :boolean, wrapper: :with_label - unless Setting.hide_followers_count .fields-group @@ -57,6 +53,7 @@ = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label = f.input :setting_disable_color, as: :boolean, wrapper: :with_label = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label + = f.input :setting_hide_captions, as: :boolean, wrapper: :with_label .fields-group = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label |