From 91e5d9f8af3a06c329de4bd603dc904a2a297e15 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <admin@sanin.link>
Date: Sun, 10 Jun 2018 05:21:37 +0900
Subject: Fix background color of emoji-mart-bar in light theme (#7768)

* Fix background color of emoji-mart-bar

* Uniform emoji-mart-search background color in light theme as default
---
 app/javascript/styles/mastodon-light/diff.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'app/javascript/styles/mastodon-light')

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 460dc53a9..2deec6bf4 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -47,6 +47,19 @@
   background: darken($ui-base-color, 6%);
 }
 
+.emoji-mart-bar {
+  border-color: lighten($ui-base-color, 8%);
+
+  &:first-child {
+    background: $ui-base-color;
+  }
+}
+
+.emoji-mart-search input {
+  background: rgba($ui-base-color, 0.3);
+  border-color: $ui-base-color;
+}
+
 .focusable:focus {
   background: $ui-base-color;
 }
-- 
cgit 


From 7e27a3c225d564a1aa763a8b9062e29311a4a6b7 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <admin@sanin.link>
Date: Sun, 10 Jun 2018 23:54:22 +0900
Subject: Uniform media and video spoiler settings and fix them of the light
 theme (#7778)

---
 app/javascript/styles/mastodon-light/diff.scss | 11 +++++++++++
 app/javascript/styles/mastodon/components.scss |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'app/javascript/styles/mastodon-light')

diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 2deec6bf4..fad7feb98 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -87,6 +87,17 @@
   }
 }
 
+// Change the background colors of media and video spoiler
+
+.media-spoiler,
+.video-player__spoiler {
+  background: $ui-base-color;
+}
+
+.account-gallery__item a {
+  background-color: $ui-base-color;
+}
+
 // Change the colors used in the dropdown menu
 .dropdown-menu {
   background: $ui-base-color;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 939178b50..cb790ac05 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4555,7 +4555,7 @@ a.status-card {
     height: 100%;
     z-index: 4;
     border: 0;
-    background: $base-shadow-color;
+    background: $base-overlay-background;
     color: $darker-text-color;
     transition: none;
     pointer-events: none;
-- 
cgit