summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-01 18:29:46 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-01 18:29:46 +0000
commit1cd5c6d940baf5ee03e14ab924c4bb198aa04fd7 (patch)
tree0faeb868366f7747e3e6f3584eff387b200bba12
parent8e47ca1411778a76dd02a7433d339499fc1a22fe (diff)
parentd7d01bf37b53733850642e2cd27a5a9c14e3731c (diff)
downloadgitlab-ce-1cd5c6d940baf5ee03e14ab924c4bb198aa04fd7.tar.gz
Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master'
Maintain notes avatar at smaller breakpoint Closes #32985 See merge request !11841
-rw-r--r--app/assets/stylesheets/framework/timeline.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss
index cec3b54d567..10881987038 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', $screen-xs-max) {
+ @include notes-media('max', $screen-xs-min) {
background: none;
}
}
@@ -30,7 +30,7 @@
.timeline-entry-inner {
position: relative;
- @include notes-media('max', $screen-xs-max) {
+ @include notes-media('max', $screen-xs-min) {
.timeline-icon {
display: none;
}