diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-15 16:55:58 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-15 16:55:58 +0000 |
| commit | 216704f31a30c61fc6a627d94396a6dacfed456e (patch) | |
| tree | 041d260e4147108db2cead2488c4e72e44a07a97 | |
| parent | 3127bd8a43403836bedc24ea472382c72fe31f84 (diff) | |
| parent | a3a512f2efe293aa2a6a1e4eb7edf04fd9087974 (diff) | |
| download | gitlab-ce-216704f31a30c61fc6a627d94396a6dacfed456e.tar.gz | |
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
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_blob.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 0343670c203..0c62772a5c9 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -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 diff --git a/app/views/projects/blob/_blob.html.haml b/app/views/projects/blob/_blob.html.haml index e59d970bf46..863e4e3de53 100644 --- a/app/views/projects/blob/_blob.html.haml +++ b/app/views/projects/blob/_blob.html.haml @@ -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? diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 20879d69091..7e9f1122aa9 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -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 |