summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-04-17 18:46:38 +0000
committerFatih Acet <acetfatih@gmail.com>2017-04-17 18:46:38 +0000
commit16f3813106d5ad2217867ceefac44ccde39791d7 (patch)
treed0417f0127d3c899683e14f8bb1f8fa6bc50c326
parentbdaf3dfd0eb05db23719b8fc36396a41d4ba3d93 (diff)
parent98559541e89ddcf780c681b38c35c477bce6ffb7 (diff)
downloadgitlab-ce-16f3813106d5ad2217867ceefac44ccde39791d7.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 220b6d6f141..2ea2ff8362b 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;
}
@@ -443,7 +446,8 @@ ul.notes {
.award-control-icon-positive,
.award-control-icon-super-positive {
position: absolute;
- margin-left: -20px;
+ top: 0;
+ left: 0;
opacity: 0;
}