From 2ee8d5aa4321f7ed28c207dbcd2efb5495636d0d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 6 Jan 2014 14:05:39 +0200 Subject: [PATCH] Improve project show page for ipad Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/sections/projects.scss | 4 ++- app/views/projects/_home_panel.html.haml | 26 ++++++++++--------- app/views/projects/show.html.haml | 4 +-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 6142cbf9b32..b565b2bdaac 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -16,7 +16,7 @@ .project-home-panel { border-bottom: 1px solid #DDD; - padding-bottom: 25px; + padding-bottom: 15px; margin-bottom: 30px; &.empty-project { @@ -41,12 +41,14 @@ .project-home-desc { float: left; color: #777; + margin-bottom: 10px; } .project-home-links { float: right; a { margin-left: 10px; + font-weight: 500; } } } diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 6ac56a192ef..56af6722dc3 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -14,17 +14,19 @@ .form-horizontal = render "shared/clone_panel" - .project-home-extra.clearfix.row - .project-home-desc.col-md-8 - - if @project.description.present? - = @project.description - - if can?(current_user, :admin_project, @project) - – - %strong= link_to 'Edit', edit_project_path + .project-home-extra.row + .col-md-8 + .project-home-desc + - if @project.description.present? + = @project.description + - if can?(current_user, :admin_project, @project) + – + %strong= link_to 'Edit', edit_project_path - unless empty_repo - .project-home-links - = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref) - = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project) - = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) - %span.light.prepend-left-20= repository_size + .col-md-4 + .project-home-links + = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref) + = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project) + = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) + %span.light.prepend-left-20= repository_size diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index dd3574c4553..e188d365903 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,12 +1,12 @@ = render "home_panel" .row - .col-md-9.hidden-sm + .col-md-9 = render "events/event_last_push", event: @last_push = render 'shared/event_filter' .content_list .loading.hide - .col-md-3.project-side + .col-md-3.project-side.hidden-sm .clearfix - if @project.archived? .alert