about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-12-07 22:13:32 -0600
committermultiple creatures <dev@multiple-creature.party>2019-12-07 22:13:32 -0600
commit6fa9c3eb1bb416bdc05f8bd4011de396e6248aa5 (patch)
treebed741486425885e22caa0d1fb44872227b67615 /app/views
parentfeceb543fd6df602c8c117247488e415ef89b78a (diff)
add option to toggle whether regex filters should be applied to mentions
Diffstat (limited to 'app/views')
-rwxr-xr-xapp/views/layouts/application.html.haml7
-rw-r--r--app/views/settings/preferences/show.html.haml2
2 files changed, 1 insertions, 8 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 496c2eb5a..985e54683 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -68,13 +68,6 @@
       :css
         .drawer { min-width: 400px !important }
 
-    - if current_account&.user_hides_filtered_gap?
-      :css
-        .status__wrapper--filtered {
-          height: 1px !important;
-          max-height: 1px !important;
-        }
-
     - if current_account&.user_hides_mascot?
       :css
         .drawer__inner__mastodon>img { display: none !important }
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 80ecf6d40..bde3dcf23 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -84,7 +84,7 @@
 
   .fields-group
     = f.input :setting_hide_mascot, as: :boolean, wrapper: :with_label
-    = f.input :setting_remove_filtered, as: :boolean, wrapper: :with_label
+    = f.input :setting_filter_mentions, as: :boolean, wrapper: :with_label
     = f.input :setting_hide_replies_muted, as: :boolean, wrapper: :with_label
     = f.input :setting_hide_replies_blocked, as: :boolean, wrapper: :with_label
     = f.input :setting_hide_replies_blocker, as: :boolean, wrapper: :with_label