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

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;