diff options
| author | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-03-29 19:05:02 +0100 |
|---|---|---|
| committer | Arinde Eniola <eniolaarinde1@gmail.com> | 2016-04-01 00:07:59 +0100 |
| commit | 932c2f59cbf8c7a393b5e23fc8b79ce9a7db76e4 (patch) | |
| tree | d400e96a9ce0fd012ea9bc166705414e9a70d6f9 | |
| parent | 82539cff700931532b22b6a8e3d6832137fc5d55 (diff) | |
| download | gitlab-ce-932c2f59cbf8c7a393b5e23fc8b79ce9a7db76e4.tar.gz | |
hide user profile activity graph on mobile and enable horizontal scroll for medium screenshide_profile_activity_on_mobile
| -rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 6 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index e3192823a1a..0b3af592d4a 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -1,3 +1,9 @@ +.calender-block { + @media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) { + overflow-x: scroll; + } +} + .user-calendar-activities { .calendar_onclick_hr { padding: 0; diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index bca816f22cb..0c4b6a5618b 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -87,7 +87,7 @@ %div{ class: container_class } .tab-content #activity.tab-pane - .gray-content-block.white.second-block + .gray-content-block.calender-block.white.second-block.hidden-xs %div{ class: container_class } .user-calendar{data: {href: user_calendar_path}} %h4.center.light |