Commit 216704f31a30c61fc6a627d94396a6dacfed456e
Exists in
spb-stable
and in
2 other branches
Merge branch 'mobile-ui-improvements' into 'master'
Mobile ui improvements * Fixes blob view - https://twitter.com/jamesgecko/status/466675058664951808 * Hide project sidebar for xs * Hide group activity for xs
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
app/views/groups/show.html.haml
| 1 | .dashboard | 1 | .dashboard |
| 2 | - .activities.col-md-8.hidden-sm | 2 | + .activities.col-md-8.hidden-sm.hidden-xs |
| 3 | - if current_user | 3 | - if current_user |
| 4 | = render "events/event_last_push", event: @last_push | 4 | = render "events/event_last_push", event: @last_push |
| 5 | = link_to dashboard_path, class: 'btn btn-tiny' do | 5 | = link_to dashboard_path, class: 'btn btn-tiny' do |
app/views/projects/blob/_blob.html.haml
| @@ -15,18 +15,18 @@ | @@ -15,18 +15,18 @@ | ||
| 15 | - else | 15 | - else |
| 16 | = link_to title, '#' | 16 | = link_to title, '#' |
| 17 | 17 | ||
| 18 | -%ul.blob-commit-info.bs-callout.bs-callout-info | 18 | +%ul.blob-commit-info.bs-callout.bs-callout-info.hidden-xs |
| 19 | - blob_commit = @repository.last_commit_for_path(@commit.id, @blob.path) | 19 | - blob_commit = @repository.last_commit_for_path(@commit.id, @blob.path) |
| 20 | = render blob_commit, project: @project | 20 | = render blob_commit, project: @project |
| 21 | 21 | ||
| 22 | %div#tree-content-holder.tree-content-holder | 22 | %div#tree-content-holder.tree-content-holder |
| 23 | .file-holder | 23 | .file-holder |
| 24 | - .file-title | 24 | + .file-title.clearfix |
| 25 | %i.icon-file | 25 | %i.icon-file |
| 26 | %span.file_name | 26 | %span.file_name |
| 27 | = blob.name | 27 | = blob.name |
| 28 | %small= number_to_human_size blob.size | 28 | %small= number_to_human_size blob.size |
| 29 | - %span.options= render "actions" | 29 | + %span.options.hidden-xs= render "actions" |
| 30 | - if blob.text? | 30 | - if blob.text? |
| 31 | = render "text", blob: blob | 31 | = render "text", blob: blob |
| 32 | - elsif blob.image? | 32 | - elsif blob.image? |
app/views/projects/show.html.haml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | = render 'shared/event_filter' | 6 | = render 'shared/event_filter' |
| 7 | .content_list | 7 | .content_list |
| 8 | = spinner | 8 | = spinner |
| 9 | - .col-md-3.project-side.hidden-sm | 9 | + .col-md-3.project-side.hidden-sm.hidden-xs |
| 10 | .clearfix | 10 | .clearfix |
| 11 | - if @project.archived? | 11 | - if @project.archived? |
| 12 | .alert.alert-warning | 12 | .alert.alert-warning |