diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-30 01:41:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-30 01:41:35 +0100 |
commit | 8fb69f1366577483f048bf4d69f610087da99cb1 (patch) | |
tree | 22e88f004fa76c9091c47d303deacc29592b1ec4 /app/javascript/styles/mastodon/emoji_picker.scss | |
parent | 79227d153b86144e9a8cc73f1d4045973eabc9ef (diff) |
Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)
Fix #10315 This reverts commit db06b25376ac7e844e86fb9890fa9f1c2edd2d60.
Diffstat (limited to 'app/javascript/styles/mastodon/emoji_picker.scss')
-rw-r--r-- | app/javascript/styles/mastodon/emoji_picker.scss | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss index d53f41a0b..e49084b5f 100644 --- a/app/javascript/styles/mastodon/emoji_picker.scss +++ b/app/javascript/styles/mastodon/emoji_picker.scss @@ -1,5 +1,3 @@ -@import '../../../node_modules/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: -1px; } - - 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; } } |