diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-08 09:43:33 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-05-08 09:43:33 -0500 |
commit | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (patch) | |
tree | 0643b1ff72e35e4ea61209e8320a060879951744 /app/javascript/flavours/glitch/styles/components/emoji_picker.scss | |
parent | 7600067a300b650a6f30da19a469c913243f3a13 (diff) | |
parent | 919e2098cb7c2ff30e19ab4f4e4c8ec9506d230d (diff) |
Merge remote-tracking branch 'glitchsoc/master' into gs-master
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/emoji_picker.scss')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/emoji_picker.scss | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/emoji_picker.scss b/app/javascript/flavours/glitch/styles/components/emoji_picker.scss index 4161cc045..dcc551c5b 100644 --- a/app/javascript/flavours/glitch/styles/components/emoji_picker.scss +++ b/app/javascript/flavours/glitch/styles/components/emoji_picker.scss @@ -7,7 +7,7 @@ font-size: 13px; display: inline-block; - color: $ui-base-color; + color: $inverted-text-color; .emoji-mart-emoji { padding: 6px; @@ -36,7 +36,7 @@ display: flex; justify-content: space-between; padding: 0 6px; - color: $ui-primary-color; + color: $lighter-text-color; line-height: 0; } @@ -50,15 +50,15 @@ cursor: pointer; &:hover { - color: darken($ui-primary-color, 4%); + color: darken($lighter-text-color, 4%); } } .emoji-mart-anchor-selected { - color: darken($ui-highlight-color, 3%); + color: $highlight-text-color; &:hover { - color: darken($ui-highlight-color, 3%); + color: darken($highlight-text-color, 4%); } .emoji-mart-anchor-bar { @@ -115,7 +115,7 @@ display: block; width: 100%; background: rgba($ui-secondary-color, 0.3); - color: $ui-primary-color; + color: $inverted-text-color; border: 1px solid $ui-secondary-color; border-radius: 4px; @@ -184,7 +184,7 @@ font-size: 14px; text-align: center; padding-top: 70px; - color: $ui-primary-color; + color: $light-text-color; .emoji-mart-category-label { display: none; |