mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-18 17:16:08 +10:00
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
This commit is contained in:
@@ -43,8 +43,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.page-title .new-issue-link {
|
||||
display: none;
|
||||
.page-title {
|
||||
.note_created_ago, .new-issue-link {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.issue_edited_ago, .note_edited_ago {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
.row
|
||||
.col-md-8
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
%section.col-md-8
|
||||
%h3.page-title
|
||||
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
|
||||
= @user.name
|
||||
@@ -19,10 +21,11 @@
|
||||
= render 'groups', groups: @groups
|
||||
%hr
|
||||
|
||||
.user-calendar
|
||||
%h4.center.light
|
||||
%i.fa.fa-spinner.fa-spin
|
||||
%hr
|
||||
.hidden-xs
|
||||
.user-calendar
|
||||
%h4.center.light
|
||||
%i.fa.fa-spinner.fa-spin
|
||||
%hr
|
||||
%h4
|
||||
User Activity
|
||||
|
||||
@@ -33,7 +36,7 @@
|
||||
%i.fa.fa-rss
|
||||
|
||||
= render @events
|
||||
.col-md-4
|
||||
%aside.col-md-4
|
||||
= render 'profile', user: @user
|
||||
= render 'projects'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user