summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-22 19:11:55 +0000
committerClement Ho <ClemMakesApps@gmail.com>2017-05-22 16:38:18 -0500
commit4e3296bf13a64a2c8d86037230919d2abcd35f1c (patch)
tree9bae0508f0ea664d72d92985980f7979cd4d792d
parent2f76387754437efbc8c3a4838ec1bfda17ab4bb4 (diff)
downloadgitlab-ce-4e3296bf13a64a2c8d86037230919d2abcd35f1c.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 9159927ed8b..8dbb63c3ff4 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: