Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8e858228
Commit
8e858228
authored
Apr 20, 2021
by
Simon Knox
Committed by
Phil Hughes
Apr 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix new emoji picker in dark mode
parent
8b407f0a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/emoji/components/category.vue
app/assets/javascripts/emoji/components/category.vue
+1
-1
app/assets/javascripts/emoji/components/picker.vue
app/assets/javascripts/emoji/components/picker.vue
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
No files found.
app/assets/javascripts/emoji/components/category.vue
View file @
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"
>
...
...
app/assets/javascripts/emoji/components/picker.vue
View file @
8e858228
...
@@ -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-b
lack-normal
! emoji-picker-category-active': index === currentCategory,
'gl-text-b
ody
! 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"
...
...
app/assets/stylesheets/framework/variables.scss
View file @
8e858228
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment