diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-07-21 19:51:07 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-07-21 19:51:07 -0500 |
| commit | d9073f132b041fae818ae3894503065de123f257 (patch) | |
| tree | 9c4bdd4dcfdf86458dfa444af1ca31e89ee8a410 /app/views | |
| parent | 61461a53239b18ee581dd1b57c1cd83c0900814b (diff) | |
add more options for time range of roars visible to anonymous public profile viewers
Diffstat (limited to 'app/views')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 9 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 856f4b045..1110942ac 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -37,15 +37,6 @@ - if Setting.custom_css.present? = stylesheet_link_tag custom_css_path, media: 'all' - - if current_account&.user_hides_color_formatting? - :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_hides_captions? :css div .media-caption, diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index d7a69d980..5d5a277d2 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -43,6 +43,9 @@ = f.input :setting_show_application, as: :boolean, wrapper: :with_label = f.input :setting_noindex, as: :boolean, wrapper: :with_label + .fields-group + = f.input :setting_max_public_history, collection: [1, 3, 6, 7, 14, 30, 60, 90, 180, 365, 730, 1095, 2190], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_max_public_history_#{item}")]) }, selected: current_user.max_public_history.to_i + - unless Setting.hide_followers_count .fields-group = f.input :setting_hide_followers_count, as: :boolean, wrapper: :with_label @@ -52,7 +55,6 @@ .fields-group = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label = 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 = f.input :setting_larger_menus, as: :boolean, wrapper: :with_label |