From 51c9f8b7a4d5cd206696c4ceb2d08aac4ea35b17 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius@meedan.com>
Date: Sat, 30 Dec 2023 20:56:05 -0800
Subject: [PATCH] Fix Macaron theme

---
 app/javascript/styles/macaron/diff.scss      | 11 ++++++++++-
 app/javascript/styles/macaron/variables.scss |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index 5a67f1bf0..32d1d89b4 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -542,10 +542,19 @@ body.admin {
 .boost-modal,
 .confirmation-modal,
 .mute-modal,
+.block-modal,
 .report-modal,
+.report-dialog-modal,
 .embed-modal,
 .error-modal,
-.onboarding-modal {
+.onboarding-modal,
+.compare-history-modal,
+.report-modal__comment .setting-text__wrapper,
+.report-modal__comment .setting-text,
+.announcements,
+.picture-in-picture__header,
+.picture-in-picture__footer,
+.reactions-bar__item {
   background: $ui-base-color;
 }
 
diff --git a/app/javascript/styles/macaron/variables.scss b/app/javascript/styles/macaron/variables.scss
index 8015f222e..c323aa436 100644
--- a/app/javascript/styles/macaron/variables.scss
+++ b/app/javascript/styles/macaron/variables.scss
@@ -26,6 +26,15 @@ $ui-primary-color: #9bcbed;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $blueberry;
 
+$ui-button-background-color: $blueberry !default;
+
+$ui-button-secondary-color: $classic-base-color !default;
+$ui-button-secondary-border-color: $classic-base-color !default;
+$ui-button-secondary-focus-color: $white !default;
+
+$ui-button-tertiary-color: $pink !default;
+$ui-button-tertiary-border-color: $pink !default;
+
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
 $dark-text-color: #444b5d;