summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-20 07:49:58 +0000
committerkushalpandya <kushal@gitlab.com>2017-06-20 14:03:47 +0530
commit4cf4b1650e52ac82ad8087bdf1bdf7393b644442 (patch)
treeddd79fb3dc6d6eae26cb9050bf8315f54ed521d9
parentd272a50519b91a15dbeda8b63afef24606d9520b (diff)
downloadgitlab-ce-4cf4b1650e52ac82ad8087bdf1bdf7393b644442.tar.gz
Merge branch '33865-add-emoji-parallel-view' into 'master'
Fix hover style for emoji button on parallel diff view Closes #33865 See merge request !12281
-rw-r--r--app/assets/stylesheets/pages/notes.scss5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index a0442463390..8b7df4dd72b 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -509,11 +509,6 @@ ul.notes {
display: inline;
line-height: 20px;
- @include notes-media('min', $screen-sm-min) {
- margin-left: 10px;
- line-height: 24px;
- }
-
.fa {
color: $gray-darkest;
position: relative;