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

Merge branch '33865-add-emoji-parallel-view' into 'master'
4cf4b165 · Phil Hughes · kushalpandya · d272a505 · 4cf4b165
Commit 4cf4b165 authored Jun 20, 2017 by Phil Hughes Committed by kushalpandya Jun 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

notes.scss app/assets/stylesheets/pages/notes.scss +0 -5

No files found.
--- 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;