summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-04-11 16:20:14 -0400
committerBryce Johnson <bryce@gitlab.com>2017-04-11 18:48:45 -0400
commit9b9ad44d2107e2e132d780ec26e95dcf753f4370 (patch)
treed82092a64de2d2133303b8c70688e492a649bc19
parent04a3e60e419ed1e7a8f253c7200703179a2177e1 (diff)
downloadgitlab-ce-user-activity-scroll-bar.tar.gz
Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-bar
-rw-r--r--app/assets/stylesheets/framework/calendar.scss2
-rw-r--r--changelogs/unreleased/user-activity-scroll-bar.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index 9a0f7a14e57..759401a7806 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -5,7 +5,7 @@
direction: rtl;
@media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
- overflow-x: scroll;
+ overflow-x: auto;
}
}
diff --git a/changelogs/unreleased/user-activity-scroll-bar.yml b/changelogs/unreleased/user-activity-scroll-bar.yml
new file mode 100644
index 00000000000..97cccee42cb
--- /dev/null
+++ b/changelogs/unreleased/user-activity-scroll-bar.yml
@@ -0,0 +1,4 @@
+---
+title: Fix preemptive scroll bar on user activity calendar.
+merge_request: !10636
+author: