diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-12 14:36:21 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-12 14:36:21 +0000 |
| commit | 376f2891f18ca23dadeb9064f662dbbb9b083fe2 (patch) | |
| tree | a251834f5b5d0c67bbc27be27c871ae84c98ff03 | |
| parent | 1ca5f0543c2429f8d3fd417550ea8e4c3018fdd5 (diff) | |
| parent | 9b9ad44d2107e2e132d780ec26e95dcf753f4370 (diff) | |
| download | gitlab-ce-376f2891f18ca23dadeb9064f662dbbb9b083fe2.tar.gz | |
Merge branch 'user-activity-scroll-bar' into 'master'
Set user contribution calendar `overflow-x: scroll` more precisely
Closes #30738
See merge request !10636
| -rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/user-activity-scroll-bar.yml | 4 |
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: |