Commit a3e18d87 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'mobile-improvements' into 'master'

Mobile improvements for user page

* hide calendar on small screens
* hide sidebar and show button to toggle it

Fixes #2101

See merge request !1652
parents 1475cb9a 2e99d7c9
...@@ -43,8 +43,10 @@ ...@@ -43,8 +43,10 @@
} }
} }
.page-title .new-issue-link { .page-title {
display: none; .note_created_ago, .new-issue-link {
display: none;
}
} }
.issue_edited_ago, .note_edited_ago { .issue_edited_ago, .note_edited_ago {
......
.row .row
.col-md-8 = link_to '#aside', class: 'show-aside' do
%i.fa.fa-angle-left
%section.col-md-8
%h3.page-title %h3.page-title
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
= @user.name = @user.name
...@@ -19,10 +21,11 @@ ...@@ -19,10 +21,11 @@
= render 'groups', groups: @groups = render 'groups', groups: @groups
%hr %hr
.user-calendar .hidden-xs
%h4.center.light .user-calendar
%i.fa.fa-spinner.fa-spin %h4.center.light
%hr %i.fa.fa-spinner.fa-spin
%hr
%h4 %h4
User Activity User Activity
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
%i.fa.fa-rss %i.fa.fa-rss
= render @events = render @events
.col-md-4 %aside.col-md-4
= render 'profile', user: @user = render 'profile', user: @user
= render 'projects' = render 'projects'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment