summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-04-17 18:46:38 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-18 15:34:26 +0800
commitd2d77b5de99af2266683a3e55c6249dffaaf2795 (patch)
tree568bb7307e18f88393ed1e3d11b957fe8ad31622
parent51124b0802c5ac18118ce87b6478d761a56c994b (diff)
downloadgitlab-ce-d2d77b5de99af2266683a3e55c6249dffaaf2795.tar.gz
Merge branch '30863-fix-award-button-smiley-jumping-out-of-place' into 'master'
Fix award button smiley jumping out of place Closes #30863 See merge request !10672
-rw-r--r--app/assets/stylesheets/pages/notes.scss6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index c78fb8ede79..6fdc9c724b4 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -123,6 +123,9 @@ ul.notes {
}
.note-emoji-button {
+ position: relative;
+ line-height: 1;
+
.fa-spinner {
display: none;
}
@@ -428,7 +431,8 @@ ul.notes {
.award-control-icon-positive,
.award-control-icon-super-positive {
position: absolute;
- margin-left: -20px;
+ top: 0;
+ left: 0;
opacity: 0;
}