about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-01 20:06:13 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-04-01 20:06:13 +0200
commit62bafa20a112ccdddaedb25723fc819dbbcd8e9a (patch)
treebfad870e5366780dc13cc65280268695eb807858 /app/javascript/styles
parent67eb47e25f1e7704dd9ecd32695ff3b53c807375 (diff)
Hide blocking accounts from blocked users (#10442)
* Revert "Add indication that you have been blocked in web UI (#10420)"

This reverts commit bd02ec6daa974dcd3231e73826a56e08dbeedadc.

* Revert "Add `blocked_by` relationship to the REST API (#10373)"

This reverts commit 9745de883b198375ba23f7fde879f6d75ce2df0f.

* Hide blocking accounts from search results

* Filter blocking accouts from account followers

* Filter blocking accouts from account's following accounts

* Filter blocking accounts from “reblogged by” and “favourited by” lists

* Remove blocking account from URL search

* Return 410 on trying to fetch user data from a user who blocked us

* Return 410 in /api/v1/account/statuses for suspended or blocking accounts

* Fix status filtering when performing URL search

* Restore some React improvements

Restore some cleanup from bd02ec6daa974dcd3231e73826a56e08dbeedadc

* Refactor by adding `without_blocking` scope
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/stream_entries.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index a739c446d..d8bd30377 100644
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -99,9 +99,9 @@
     }
   }
 
-  &:active:not(:disabled),
-  &:focus:not(:disabled),
-  &:hover:not(:disabled) {
+  &:active,
+  &:focus,
+  &:hover {
     background: lighten($ui-highlight-color, 10%);
 
     svg path:last-child {