Merge branch 'user-activity-scroll-bar' into 'master'

Set user contribution calendar `overflow-x: scroll` more precisely Closes #30738 See merge request !10636

Merge branch 'user-activity-scroll-bar' into 'master'
376f2891 · Annabel Dunstone Gray · 1ca5f054 · 9b9ad44d · 376f2891 · 376f2891
Commit 376f2891 authored Apr 12, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

calendar.scss app/assets/stylesheets/framework/calendar.scss +1 -1

user-activity-scroll-bar.yml changelogs/unreleased/user-activity-scroll-bar.yml +4 -0

No files found.
--- 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;
  }
 }


--- a/changelogs/unreleased/user-activity-scroll-bar.yml
+++ b/changelogs/unreleased/user-activity-scroll-bar.yml
+---
+title: Fix preemptive scroll bar on user activity calendar.
+merge_request: !10636
+author: