kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '54725-fix-emoji-button-active-state' into 'master'

Browse source 
Resolve "Add reaction emoji styling is off"

See merge request gitlab-org/gitlab-ce!25295
This commit is contained in:
Phil Hughes 2019-02-15 17:58:10 +00:00
commit 535c69547f
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/framework/awards.scss
View file

@ -233,12 +233,12 @@
height: $default-icon-size; height: $default-icon-size;
width: $default-icon-size; width: $default-icon-size;
border-radius: 50%; border-radius: 50%;
}
path { path {
fill: $border-gray-normal; fill: $border-gray-normal;
} }
} }
}
.award-control-icon-positive, .award-control-icon-positive,
.award-control-icon-super-positive { .award-control-icon-super-positive {
@ -247,6 +247,10 @@
left: 10px; left: 10px;
bottom: 6px; bottom: 6px;
opacity: 0; opacity: 0;
path {
fill: $award-emoji-positive-add-lines;
}
} }
.award-control-text { .award-control-text {

5
changelogs/unreleased/54725-fix-emoji-button-active-state.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix hover and active state colors of award emoji button
merge_request: 25295
author:
type: fixed