Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream

2023-08-24 21:50:14 +02:00
parent def58f8ac3 e3fd071973
commit 32e67e78a3
5 changed files with 18 additions and 8 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5125,6 +5125,7 @@ a.status-card {

    &.active {
      transform: rotate(90deg);
+      opacity: 1;
    }

    &:hover {
--- a/app/models/public_feed.rb
+++ b/app/models/public_feed.rb
@@ -51,11 +51,11 @@ class PublicFeed
  end

  def local_only?
-    options[:local]
+    options[:local] && !options[:remote]
  end

  def remote_only?
-    options[:remote]
+    options[:remote] && !options[:local]
  end

  def account?