summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-02-15 17:58:10 +0000
committerPhil Hughes <me@iamphill.com>2019-02-15 17:58:10 +0000
commit535c69547f35e991b2dc604d93572bea7ad4a933 (patch)
tree67d18f09ac8be532d74d6fa8e4196beb46772d79 /app/assets
parent5e59393746eec5d0a4f48a02e8d479da8edd912c (diff)
parentf6edaaca56b12682346077e4644e7a7dc0b8fa5f (diff)
downloadgitlab-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
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/awards.scss10
1 files changed, 7 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 {