Combine core vars

4 files changed, 25 insertions, 50 deletions

diff --git a/app/src/web/scss/messenger/core/_core_vars.scss b/app/src/web/scss/core/_core_vars.scss
index 66795299..c7bee823 100644
--- a/app/src/web/scss/messenger/core/_core_vars.scss
+++ b/app/src/web/scss/core/_core_vars.scss
@@ -1,28 +1,42 @@
 :root, .__fb-light-mode {
+  --accent: #{$accent} !important;
   --attachment-footer-background: #{$bg_opaque} !important;
-  --card-background-flat: #{$bg_opaque} !important;
+  --background-deemphasized: #{$background} !important;
   --card-background: #{$bg_opaque} !important;
+  --card-background-flat: #{$bg_opaque} !important;
   --comment-background: #{$bg_opaque2} !important;
   --comment-footer-background: #{$bg_opaque} !important;
-  --disabled-button-background: #{$bg_opaque} !important;
+  --darkreader-bg--fds-white: #{$bg_opaque} !important;
+  --darkreader-text--primary-text: #{$text} !important;
+  --darkreader-text--secondary-text: #{$text} !important;
+  --disabled-button-background: #{$divider} !important;
+  --disabled-button-text: #{$text_disabled} !important;
   --disabled-icon: #{$text_disabled} !important;
   --disabled-text: #{$text_disabled} !important;
   --divider: #{$divider} !important;
-  --hero-banner-background: #{$bg_opaque} !important;
+  --event-date: #{$accent} !important;
+  --glimmer-spinner-icon: #{$accent} !important;
+  --hero-banner-background: #{$bg_opaque2} !important;
   --highlight-bg: #{$bg_opaque2} !important;
-  --media-outer-border: #{$bg_opaque} !important;
-  --messenger-card-background: #{$bg_opaque} !important;
+  --media-outer-border: #{$divider} !important;
   --messenger-card-background: #{$bg_opaque} !important; // Main background; needs to be opaque to hide gradient used for sender card
   --messenger-reply-background: #{$bg_opaque2} !important;
-  --nav-bar-background-gradient-wash: #{$bg_opaque} !important;
-  --nav-bar-background-gradient: #{$bg_opaque} !important;
   --nav-bar-background: #{$bg_opaque} !important;
-  --new-notification-background: #{$bg_opaque2} !important;
-  --placeholder-text: #{$text} !important; // Date
+  --new-notification-background: #{$background2} !important;
+  --placeholder-icon: #{$text} !important;
+  --popover-background: #{$bg_opaque2} !important;
   --primary-icon: #{$text} !important;
   --primary-text: #{$text} !important;
+  --primary-button-text: #{$text} !important;
+  --primary-deemphasized-button-background: #{$divider} !important;
+  --primary-text-on-media: #{$text} !important;
+  --scroll-thumb: #{$accent} !important;
   --secondary-icon: #{$text} !important;
   --secondary-text: #{$text} !important;
+  --section-header-text: #{$text} !important;
+  --nav-bar-background-gradient-wash: #{$bg_opaque} !important;
+  --nav-bar-background-gradient: #{$bg_opaque} !important;
+  --placeholder-text: #{$text} !important; // Date
   --surface-background: #{$bg_opaque2} !important; // Emoji background
   --toggle-active-background: #{$bg_opaque2} !important;
   --wash: #{$bg_opaque2} !important;
diff --git a/app/src/web/scss/facebook/core/_core_vars.scss b/app/src/web/scss/facebook/core/_core_vars.scss
deleted file mode 100644
index a618b703..00000000
--- a/app/src/web/scss/facebook/core/_core_vars.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-:root, .__fb-light-mode {
-  --accent: #{$accent} !important;
-  --attachment-footer-background: #{$background} !important;
-  --background-deemphasized: #{$background} !important;
-  --card-background: #{$card} !important;
-  --card-background-flat: #{$card} !important;
-  --comment-background: #{$background} !important;
-  --comment-footer-background: #{$background} !important;
-  --darkreader-bg--fds-white: #{$bg_opaque} !important;
-  --darkreader-text--primary-text: #{$text} !important;
-  --darkreader-text--secondary-text: #{$text} !important;
-  --disabled-button-background: #{$divider} !important;
-  --disabled-button-text: #{$text_disabled} !important;
-  --disabled-icon: #{$text_disabled} !important;
-  --disabled-text: #{$text_disabled} !important;
-  --divider: #{$divider} !important;
-  --event-date: #{$accent} !important;
-  --glimmer-spinner-icon: #{$accent} !important;
-  --hero-banner-background: #{$bg_opaque2} !important;
-  --highlight-bg: #{$background2} !important;
-  --media-outer-border: #{$divider} !important;
-  --messenger-card-background: #{$card} !important;
-  --messenger-reply-background: #{$card} !important;
-  --nav-bar-background: #{$bg_opaque} !important;
-  --new-notification-background: #{$background2} !important;
-  --placeholder-icon: #{$text} !important;
-  --placeholder-text: #{$text} !important;
-  --popover-background: #{$bg_opaque2} !important;
-  --primary-icon: #{$text} !important;
-  --primary-text: #{$text} !important;
-  --primary-button-text: #{$text} !important;
-  --primary-deemphasized-button-background: #{$divider} !important;
-  --primary-text-on-media: #{$text} !important;
-  --scroll-thumb: #{$accent} !important;
-  --secondary-icon: #{$text} !important;
-  --secondary-text: #{$text} !important;
-  --section-header-text: #{$text} !important;
-  --surface-background: #{$background} !important;
-}
diff --git a/app/src/web/scss/facebook/core/core.scss b/app/src/web/scss/facebook/core/core.scss
index 557f7398..f03cdd68 100644
--- a/app/src/web/scss/facebook/core/core.scss
+++ b/app/src/web/scss/facebook/core/core.scss
@@ -1,6 +1,6 @@
 @import "../../core/colors";
 @import "../../core/base";
-@import "core_vars";
+@import "../../core/core_vars";
 @import "core_text";
 @import "core_bg";
 @import "core_border";
diff --git a/app/src/web/scss/messenger/core/core.scss b/app/src/web/scss/messenger/core/core.scss
index 89199222..7cebadb5 100644
--- a/app/src/web/scss/messenger/core/core.scss
+++ b/app/src/web/scss/messenger/core/core.scss
@@ -1,6 +1,6 @@
 @import "../../core/colors";
 @import "../../core/base";
-@import "core_vars";
+@import "../../core/core_vars";
 @import "core_text";
 @import "core_bg";
 @import "core_border";