summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-20 07:49:58 +0000
committerPhil Hughes <me@iamphill.com>2017-06-20 07:49:58 +0000
commit5214e507b043c8e71d2826252491cdac97d27416 (patch)
tree04cc5f79f11773679dfddd427c125e8fd1719c58 /app
parentbcc5fc857af318835c923d12f18396261f5065a4 (diff)
parentb03c82c64eacb4882022f8fa67b66c2c8edee6ba (diff)
downloadgitlab-ce-5214e507b043c8e71d2826252491cdac97d27416.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
Diffstat (limited to 'app')
-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;