From 9b1ecf7aee670b95077b0fde86ada3edf9c75f89 Mon Sep 17 00:00:00 2001
From: Michael Stanclift <mx@vmstan.com>
Date: Thu, 12 Sep 2024 09:18:43 -0500
Subject: [PATCH] [Glitch] Fix review history and action modal styling

Port a269ff9253050fb9a0b2c063c253eacfad77b738 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---
 .../flavours/glitch/styles/components.scss    | 19 +++++--------
 .../glitch/styles/mastodon-light/diff.scss    | 27 -------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss
index 0c09adec9a4bb3..4f922e51390e80 100644
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -6812,19 +6812,12 @@ a.status-card {
   position: relative;
   flex-direction: column;
 
-  .status__relative-time {
-    order: 2;
-  }
-
-  .status__content__spoiler-link {
-    color: lighten($secondary-text-color, 8%);
+  @media screen and (max-width: $no-columns-breakpoint) {
+    border-bottom: 0;
+    border-radius: 4px 4px 0 0;
   }
 }
 
-.boost-modal .status-direct {
-  background-color: inherit;
-}
-
 .boost-modal__container {
   overflow-y: auto;
   padding: 10px;
@@ -7221,7 +7214,7 @@ a.status-card {
 
     li:not(:empty) {
       a {
-        color: $inverted-text-color;
+        color: $primary-text-color;
         display: flex;
         padding: 12px 16px;
         font-size: 15px;
@@ -7314,7 +7307,7 @@ a.status-card {
 
 .compare-history-modal {
   .report-modal__target {
-    border-bottom: 1px solid $ui-secondary-color;
+    border-bottom: 1px solid var(--background-border-color);
   }
 
   &__container {
@@ -7324,7 +7317,7 @@ a.status-card {
   }
 
   .status__content {
-    color: $inverted-text-color;
+    color: $secondary-text-color;
     font-size: 19px;
     line-height: 24px;
 
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 850a67dd2c3fa4..2e5cb59398d066 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -147,33 +147,6 @@
   border-top-color: lighten($ui-base-color, 4%);
 }
 
-// Change the background colors of modals
-.actions-modal,
-.boost-modal,
-.confirmation-modal,
-.mute-modal,
-.block-modal,
-.report-modal,
-.report-dialog-modal,
-.embed-modal,
-.error-modal,
-.onboarding-modal,
-.compare-history-modal,
-.report-modal__comment,
-.report-modal__comment,
-.announcements,
-.picture-in-picture__header,
-.picture-in-picture__footer,
-.reactions-bar__item {
-  background: $white;
-  border: 1px solid var(--background-border-color);
-}
-
-.setting-text__wrapper,
-.setting-text {
-  border: 1px solid var(--background-border-color);
-}
-
 .reactions-bar__item:hover,
 .reactions-bar__item:focus,
 .reactions-bar__item:active {