summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-22 19:11:55 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-22 19:11:55 +0000
commite39edeb5cce377fd5648bf48e22020aa798e5d6e (patch)
treee1bd55e723db98d2d3b21f529e8443c82ad45315
parent50a00442285973a390fa448d189ee43cd700d668 (diff)
parentcf67df0bda9a8d44723b703ee355819aea1891e2 (diff)
downloadgitlab-ce-e39edeb5cce377fd5648bf48e22020aa798e5d6e.tar.gz
Merge branch '32486-fix-note-emoji-placement' into 'master'
32486 Fix placement of note emoji on hover Closes #32486 See merge request !11605
-rw-r--r--app/assets/stylesheets/framework/awards.scss4
-rw-r--r--changelogs/unreleased/32486-fix-note-emoji-placement.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index b5f00cb20d4..0db3ac1a60e 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -237,7 +237,3 @@
vertical-align: middle;
}
}
-
-.note-awards .award-control-icon-positive {
- left: 6px;
-}
diff --git a/changelogs/unreleased/32486-fix-note-emoji-placement.yml b/changelogs/unreleased/32486-fix-note-emoji-placement.yml
new file mode 100644
index 00000000000..62c345895fc
--- /dev/null
+++ b/changelogs/unreleased/32486-fix-note-emoji-placement.yml
@@ -0,0 +1,4 @@
+---
+title: Fix placement of note emoji on hover
+merge_request:
+author: