From 063a1c2a8bfaa76215537a8ce7d433cda5ce9755 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 6 Dec 2017 20:18:27 +0900
Subject: [PATCH] Fix emoji picker scrollbar (regression from #5046) (#5901)
---
app/javascript/styles/mastodon/components.scss | 5 -----
app/javascript/styles/mastodon/emoji_picker.scss | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a582d2628..8a1f90e3f 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -440,11 +440,6 @@
position: absolute;
right: 5px;
top: 5px;
-
- ::-webkit-scrollbar-track:hover,
- ::-webkit-scrollbar-track:active {
- background-color: rgba($base-overlay-background, 0.3);
- }
}
}
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 2b46d30fc..4161cc045 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -95,6 +95,11 @@
padding: 0 6px 6px;
background: $simple-background-color;
will-change: transform;
+
+ &::-webkit-scrollbar-track:hover,
+ &::-webkit-scrollbar-track:active {
+ background-color: rgba($base-overlay-background, 0.3);
+ }
}
.emoji-mart-search {