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
This commit is contained in:
Dmitriy Zaporozhets 2014-05-15 16:55:58 +00:00
commit 216704f31a
3 changed files with 5 additions and 5 deletions

View file

@ -1,5 +1,5 @@
.dashboard
.activities.col-md-8.hidden-sm
.activities.col-md-8.hidden-sm.hidden-xs
- if current_user
= render "events/event_last_push", event: @last_push
= link_to dashboard_path, class: 'btn btn-tiny' do

View file

@ -15,18 +15,18 @@
- else
= 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)
= render blob_commit, project: @project
%div#tree-content-holder.tree-content-holder
.file-holder
.file-title
.file-title.clearfix
%i.icon-file
%span.file_name
= blob.name
%small= number_to_human_size blob.size
%span.options= render "actions"
%span.options.hidden-xs= render "actions"
- if blob.text?
= render "text", blob: blob
- elsif blob.image?

View file

@ -6,7 +6,7 @@
= render 'shared/event_filter'
.content_list
= spinner
.col-md-3.project-side.hidden-sm
.col-md-3.project-side.hidden-sm.hidden-xs
.clearfix
- if @project.archived?
.alert.alert-warning