summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-02-15 09:19:37 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-02-15 09:22:05 -0600
commitf6edaaca56b12682346077e4644e7a7dc0b8fa5f (patch)
tree734ff555dedce058b1be262bf5a80c04c438ec87
parentab06c9b654c5f26fbe9e3fce22a54f7944ee4dab (diff)
downloadgitlab-ce-f6edaaca56b12682346077e4644e7a7dc0b8fa5f.tar.gz
Fix hover and active state colors of award emoji button
-rw-r--r--app/assets/stylesheets/framework/awards.scss10
-rw-r--r--changelogs/unreleased/54725-fix-emoji-button-active-state.yml5
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index ad650d45314..14ee43d67d5 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -229,10 +229,10 @@
height: $default-icon-size;
width: $default-icon-size;
border-radius: 50%;
+ }
- path {
- fill: $border-gray-normal;
- }
+ path {
+ fill: $border-gray-normal;
}
}
@@ -243,6 +243,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