about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/styles/components/emoji_picker.scss
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-27 14:04:52 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-27 14:04:52 +0100
commit355d384d8d5d2e4588117507a7ded1eb6ff67c05 (patch)
treeec00ec73e7f3a839af854aeb13602cc9341beb07 /app/javascript/flavours/glitch/styles/components/emoji_picker.scss
parent497a958297c7265e7a9fea8f61d577934192fc55 (diff)
Revert "[Glitch] fix: update to emoji-mart 2.10.0"
This reverts commit 49bea8c46b006d8c86285c8b1158cd700dc2eb45.
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/emoji_picker.scss')
-rw-r--r--app/javascript/flavours/glitch/styles/components/emoji_picker.scss25
1 files changed, 4 insertions, 21 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/emoji_picker.scss b/app/javascript/flavours/glitch/styles/components/emoji_picker.scss
index 171623352..dcc551c5b 100644
--- a/app/javascript/flavours/glitch/styles/components/emoji_picker.scss
+++ b/app/javascript/flavours/glitch/styles/components/emoji_picker.scss
@@ -1,5 +1,3 @@
-@import '~emoji-mart/css/emoji-mart.css';
-
 .emoji-mart {
   &,
   * {
@@ -53,14 +51,6 @@
 
   &:hover {
     color: darken($lighter-text-color, 4%);
-
-    svg {
-      fill: darken($lighter-text-color, 4%);
-    }
-  }
-
-  svg {
-    fill: $lighter-text-color;
   }
 }
 
@@ -69,19 +59,11 @@
 
   &:hover {
     color: darken($highlight-text-color, 4%);
-
-    svg {
-      fill: darken($highlight-text-color, 4%);
-    }
   }
 
   .emoji-mart-anchor-bar {
     bottom: 0;
   }
-
-  svg {
-    fill: $highlight-text-color;
-  }
 }
 
 .emoji-mart-anchor-bar {
@@ -101,6 +83,7 @@
   }
 
   svg {
+    fill: currentColor;
     max-height: 18px;
   }
 }
@@ -120,14 +103,15 @@
 }
 
 .emoji-mart-search {
-  margin: 10px 40px 10px 5px;
+  padding: 10px;
+  padding-right: 45px;
   background: $simple-background-color;
 
   input {
     font-size: 14px;
     font-weight: 400;
     padding: 7px 9px;
-    font-family: $font-sans-serif;
+    font-family: inherit;
     display: block;
     width: 100%;
     background: rgba($ui-secondary-color, 0.3);
@@ -182,7 +166,6 @@
     font-weight: 500;
     padding: 5px 6px;
     background: $simple-background-color;
-    font-family: $font-sans-serif;
   }
 }