diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-30 13:51:19 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-30 13:51:19 +0000 |
| commit | d962e17a02f45340fe950c4fe34f91187c5e883c (patch) | |
| tree | 699e44207e1074f04b004c096b3ca600cdb409a7 | |
| parent | 4a3ec67b7c02d391802f4e7361fd722b34f61b39 (diff) | |
| parent | 888a715b2b7f343ff64abbba06ee4a8e35fca157 (diff) | |
| download | gitlab-ce-d962e17a02f45340fe950c4fe34f91187c5e883c.tar.gz | |
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
3 files changed, 5 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 4a311da1675..3d5208c3db5 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/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, diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4fda2964fd5..0d1d0b4d2d6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/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; diff --git a/changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml b/changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml new file mode 100644 index 00000000000..dc11ede5c8d --- /dev/null +++ b/changelogs/unreleased/51029-status-emoji-currently-replaces-avatar-on-mobile.yml @@ -0,0 +1,5 @@ +--- +title: Resolve status emoji being replaced by avatar on mobile +merge_request: 23408 +author: +type: other |