summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-11 20:59:25 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-11 20:59:25 +0000
commit574847b7da93a06bd66891c16e1ad1a9b1cf39df (patch)
treeb86fc6c8faf825d4a88cdee22aa4cf3ef5ec817c
parent454a6a02ef66b1c54773cf40d663d441ebf74a55 (diff)
parenta81c9bc84c777561e1ca7b195b8ca60013693880 (diff)
downloadgitlab-ce-574847b7da93a06bd66891c16e1ad1a9b1cf39df.tar.gz
Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'
Avatars and system icons on left of notes are shown on mobile Closes #47604 See merge request gitlab-org/gitlab-ce!19585
-rw-r--r--app/assets/stylesheets/framework/timeline.scss4
-rw-r--r--changelogs/unreleased/47604-avatars-and-system-icons-for-mobile.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index 75c11590547..dfb145debe7 100644
--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -4,7 +4,7 @@
padding: 0;
&::before {
- @include notes-media('max', map-get($grid-breakpoints, xs)) {
+ @include notes-media('max', map-get($grid-breakpoints, sm)) {
background: none;
}
}
@@ -34,7 +34,7 @@
.timeline-entry-inner {
position: relative;
- @include notes-media('max', map-get($grid-breakpoints, xs)) {
+ @include notes-media('max', map-get($grid-breakpoints, sm)) {
.timeline-icon {
display: none;
}
diff --git a/changelogs/unreleased/47604-avatars-and-system-icons-for-mobile.yml b/changelogs/unreleased/47604-avatars-and-system-icons-for-mobile.yml
new file mode 100644
index 00000000000..ff66385375f
--- /dev/null
+++ b/changelogs/unreleased/47604-avatars-and-system-icons-for-mobile.yml
@@ -0,0 +1,5 @@
+---
+title: Make avatars/icons hidden on mobile
+merge_request: 19585
+author: Takuya Noguchi
+type: fixed