From 1b64242fa5ff75bcda22958afab4ad001fbeaaf4 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Wed, 1 Nov 2023 22:42:03 -0500
Subject: [PATCH] Update to mastomodern upstream

---
 .../glitch/styles/modern/glitch-fixes.scss        | 15 +++++++++++++++
 .../flavours/glitch/styles/modern/style.scss      |  2 --
 app/javascript/styles/modern/style.scss           |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/modern/glitch-fixes.scss b/app/javascript/flavours/glitch/styles/modern/glitch-fixes.scss
index 70ebcee9e1..0a273f87f5 100644
--- a/app/javascript/flavours/glitch/styles/modern/glitch-fixes.scss
+++ b/app/javascript/flavours/glitch/styles/modern/glitch-fixes.scss
@@ -65,6 +65,21 @@ body.app-body.flavour-glitch > #mastodon .collapsed .status__content::after {
   content: unset;
 }
 
+body.app-body.flavour-glitch > #mastodon .collapsed .status__action-bar :not(i),
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed
+  .detailed-status__action-bar
+  :not(i),
+body.app-body.flavour-glitch
+  > #mastodon
+  .collapsed
+  .picture-in-picture__footer
+  :not(i) {
+  height: unset !important;
+  width: unset !important;
+}
+
 body.app-body.flavour-glitch
   > #mastodon
   .collapsed.muted
diff --git a/app/javascript/flavours/glitch/styles/modern/style.scss b/app/javascript/flavours/glitch/styles/modern/style.scss
index e98488cd9d..13e419b3ba 100644
--- a/app/javascript/flavours/glitch/styles/modern/style.scss
+++ b/app/javascript/flavours/glitch/styles/modern/style.scss
@@ -2652,8 +2652,6 @@ a:focus-visible,
 #mastodon .status__action-bar :not(i),
 #mastodon .detailed-status__action-bar :not(i),
 #mastodon .picture-in-picture__footer :not(i) {
-  height: unset !important;
-  width: unset !important;
   pointer-events: all;
 }
 #mastodon .status__action-bar .icon-button,
diff --git a/app/javascript/styles/modern/style.scss b/app/javascript/styles/modern/style.scss
index 7e7d34e958..13e419b3ba 100644
--- a/app/javascript/styles/modern/style.scss
+++ b/app/javascript/styles/modern/style.scss
@@ -4664,4 +4664,4 @@ a:focus-visible,
 }
 .modal-root__container {
   animation: bounceIn 0.7s;
-}
+}
\ No newline at end of file