Commit ce19c764 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'psi-emoji-picker-dark' into 'master'

Fix new emoji picker in dark mode

See merge request gitlab-org/gitlab!59616
parents 3074e9b0 8e858228
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
<template> <template>
<gl-intersection-observer class="gl-px-5 gl-h-full" @appear="categoryAppeared"> <gl-intersection-observer class="gl-px-5 gl-h-full" @appear="categoryAppeared">
<div class="gl-top-0 gl-py-3 gl-w-full emoji-picker-category-header"> <div class="gl-top-0 gl-py-3 gl-w-full gl-z-index-1 emoji-picker-category-header">
<b>{{ categoryTitle }}</b> <b>{{ categoryTitle }}</b>
</div> </div>
<template v-if="emojis.length"> <template v-if="emojis.length">
......
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
v-for="(category, index) in categoryNames" v-for="(category, index) in categoryNames"
:key="category.name" :key="category.name"
:class="{ :class="{
'gl-text-black-normal! emoji-picker-category-active': index === currentCategory, 'gl-text-body! emoji-picker-category-active': index === currentCategory,
}" }"
type="button" type="button"
class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab" class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab"
......
...@@ -82,7 +82,7 @@ $darken-border-dashed-factor: 25% !default; ...@@ -82,7 +82,7 @@ $darken-border-dashed-factor: 25% !default;
$white: #fff !default; $white: #fff !default;
$white-normal: #f0f0f0 !default; $white-normal: #f0f0f0 !default;
$white-dark: #eaeaea !default; $white-dark: #eaeaea !default;
$white-transparent: rgba(255, 255, 255, 0.8) !default; $white-transparent: rgba($white, 0.8) !default;
$gray-lightest: #fdfdfd !default; $gray-lightest: #fdfdfd !default;
$gray-light: #fafafa !default; $gray-light: #fafafa !default;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment