BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit a3e18d87 by Dmitriy Zaporozhets
Options

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
Showing with 8 additions and 3 deletions
app/assets/stylesheets/generic/mobile.scss
...@@ -43,9 +43,11 @@ ...@@ -43,9 +43,11 @@
} }
} }
.page-title .new-issue-link { .page-title {
.note_created_ago, .new-issue-link {
display: none; display: none;
} }
}
.issue_edited_ago, .note_edited_ago { .issue_edited_ago, .note_edited_ago {
display: none; display: none;
......
app/views/users/show.html.haml
.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,6 +21,7 @@ ...@@ -19,6 +21,7 @@
= render 'groups', groups: @groups = render 'groups', groups: @groups
%hr %hr
.hidden-xs
.user-calendar .user-calendar
%h4.center.light %h4.center.light
%i.fa.fa-spinner.fa-spin %i.fa.fa-spinner.fa-spin
...@@ -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