Commit 216704f3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 3127bd8a a3a512f2
.dashboard .dashboard
.activities.col-md-8.hidden-sm .activities.col-md-8.hidden-sm.hidden-xs
- if current_user - if current_user
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
= link_to dashboard_path, class: 'btn btn-tiny' do = link_to dashboard_path, class: 'btn btn-tiny' do
......
...@@ -15,18 +15,18 @@ ...@@ -15,18 +15,18 @@
- else - else
= link_to title, '#' = link_to title, '#'
%ul.blob-commit-info.bs-callout.bs-callout-info %ul.blob-commit-info.bs-callout.bs-callout-info.hidden-xs
- blob_commit = @repository.last_commit_for_path(@commit.id, @blob.path) - blob_commit = @repository.last_commit_for_path(@commit.id, @blob.path)
= render blob_commit, project: @project = render blob_commit, project: @project
%div#tree-content-holder.tree-content-holder %div#tree-content-holder.tree-content-holder
.file-holder .file-holder
.file-title .file-title.clearfix
%i.icon-file %i.icon-file
%span.file_name %span.file_name
= blob.name = blob.name
%small= number_to_human_size blob.size %small= number_to_human_size blob.size
%span.options= render "actions" %span.options.hidden-xs= render "actions"
- if blob.text? - if blob.text?
= render "text", blob: blob = render "text", blob: blob
- elsif blob.image? - elsif blob.image?
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= render 'shared/event_filter' = render 'shared/event_filter'
.content_list .content_list
= spinner = spinner
.col-md-3.project-side.hidden-sm .col-md-3.project-side.hidden-sm.hidden-xs
.clearfix .clearfix
- if @project.archived? - if @project.archived?
.alert.alert-warning .alert.alert-warning
......
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