about summary refs log tree commit diff
path: root/app/javascript/styles/mastodon-light/diff.scss
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-12 18:12:29 -0500
committerGitHub <noreply@github.com>2018-06-12 18:12:29 -0500
commitf6bb50b6ece555af138df164680189b1ec57da4b (patch)
tree490c6054260f4a75fb0467f343124746c1935970 /app/javascript/styles/mastodon-light/diff.scss
parent34f1fd2a621ca869c17009487e2f10063812fbd0 (diff)
parentfac6e392e9d76e3cca44ce142690a59afc0a9156 (diff)
Merge pull request #539 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/javascript/styles/mastodon-light/diff.scss')
-rw-r--r--app/javascript/styles/mastodon-light/diff.scss24
1 files changed, 24 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 460dc53a9..fad7feb98 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;
 }
@@ -74,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;