diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 19:52:31 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-04 19:52:31 +0000 |
commit | 1926e55e1ff5eae09d7f3a31c3d29a6f75e7d911 (patch) | |
tree | 68e1dde4f9b6bb334866890eadd60ec05df485fb /app/views | |
parent | 2fb0ef51d68aab083b95348770e0c15dd7e1c3ec (diff) | |
parent | 932c2f59cbf8c7a393b5e23fc8b79ce9a7db76e4 (diff) | |
download | gitlab-ce-1926e55e1ff5eae09d7f3a31c3d29a6f75e7d911.tar.gz |
Merge branch 'hide_profile_activity_on_mobile' into 'master'
Hide user profile activity graph on mobile
closes #14507
## Before
![Screen_Shot_2016-03-26_at_10.28.21_PM](/uploads/5d5e2f77de936c2f2cd8a95132720a81/Screen_Shot_2016-03-26_at_10.28.21_PM.png)
## After
![Screen_Shot_2016-03-26_at_10.27.01_PM](/uploads/c011497b31368a0b7aa7d851541ac301/Screen_Shot_2016-03-26_at_10.27.01_PM.png)
## Medium width screen
![fix2](/uploads/2a5eb2d01f1a516991cd3e2b35b8aadc/fix2.gif)
See merge request !3412
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/users/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |