diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-15 17:58:10 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-15 17:58:10 +0000 |
| commit | 535c69547f35e991b2dc604d93572bea7ad4a933 (patch) | |
| tree | 67d18f09ac8be532d74d6fa8e4196beb46772d79 | |
| parent | 5e59393746eec5d0a4f48a02e8d479da8edd912c (diff) | |
| parent | f6edaaca56b12682346077e4644e7a7dc0b8fa5f (diff) | |
| download | gitlab-ce-535c69547f35e991b2dc604d93572bea7ad4a933.tar.gz | |
Merge branch '54725-fix-emoji-button-active-state' into 'master'
Resolve "Add reaction emoji styling is off"
See merge request gitlab-org/gitlab-ce!25295
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/54725-fix-emoji-button-active-state.yml | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index fd4fb16b941..5cfd5bbd4f5 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -233,10 +233,10 @@ height: $default-icon-size; width: $default-icon-size; border-radius: 50%; + } - path { - fill: $border-gray-normal; - } + path { + fill: $border-gray-normal; } } @@ -247,6 +247,10 @@ left: 10px; bottom: 6px; opacity: 0; + + path { + fill: $award-emoji-positive-add-lines; + } } .award-control-text { diff --git a/changelogs/unreleased/54725-fix-emoji-button-active-state.yml b/changelogs/unreleased/54725-fix-emoji-button-active-state.yml new file mode 100644 index 00000000000..4f0a436cc87 --- /dev/null +++ b/changelogs/unreleased/54725-fix-emoji-button-active-state.yml @@ -0,0 +1,5 @@ +--- +title: Fix hover and active state colors of award emoji button +merge_request: 25295 +author: +type: fixed |