Merge branch '51029-status-emoji-currently-replaces-avatar-on-mobile' into 'master'

Resolve "Status Emoji currently replaces avatar on mobile"

Closes #51029

See merge request gitlab-org/gitlab-ce!23408

app/assets/stylesheets/framework/timeline.scss

@@ -31,16 +31,6 @@
 
   .timeline-entry-inner {
     position: relative;
-
-    @include notes-media('max', map-get($grid-breakpoints, sm)) {
-      .timeline-icon {
-        display: none;
-      }
-
-      .timeline-content {
-        margin-left: 0;
-      }
-    }
   }
 
   &:target,

app/assets/stylesheets/pages/notes.scss

@@ -589,12 +589,6 @@ $note-form-margin-left: 72px;
   padding-bottom: 0;
 }
 
-.note-header-author-name {
-  @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
-    display: none;
-  }
-}
-
 .note-headline-light {
   display: inline;
 

changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml

+---
+title: Resolve status emoji being replaced by avatar on mobile
+merge_request: 23408
+author:
+type: other