Commit 2ee8d5aa4321f7ed28c207dbcd2efb5495636d0d
1 parent
a6da154e
Exists in
spb-stable
and in
3 other branches
Improve project show page for ipad
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
3 changed files
with
19 additions
and
15 deletions
Show diff stats
app/assets/stylesheets/sections/projects.scss
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | 16 | ||
| 17 | .project-home-panel { | 17 | .project-home-panel { |
| 18 | border-bottom: 1px solid #DDD; | 18 | border-bottom: 1px solid #DDD; |
| 19 | - padding-bottom: 25px; | 19 | + padding-bottom: 15px; |
| 20 | margin-bottom: 30px; | 20 | margin-bottom: 30px; |
| 21 | 21 | ||
| 22 | &.empty-project { | 22 | &.empty-project { |
| @@ -41,12 +41,14 @@ | @@ -41,12 +41,14 @@ | ||
| 41 | .project-home-desc { | 41 | .project-home-desc { |
| 42 | float: left; | 42 | float: left; |
| 43 | color: #777; | 43 | color: #777; |
| 44 | + margin-bottom: 10px; | ||
| 44 | } | 45 | } |
| 45 | 46 | ||
| 46 | .project-home-links { | 47 | .project-home-links { |
| 47 | float: right; | 48 | float: right; |
| 48 | a { | 49 | a { |
| 49 | margin-left: 10px; | 50 | margin-left: 10px; |
| 51 | + font-weight: 500; | ||
| 50 | } | 52 | } |
| 51 | } | 53 | } |
| 52 | } | 54 | } |
app/views/projects/_home_panel.html.haml
| @@ -14,17 +14,19 @@ | @@ -14,17 +14,19 @@ | ||
| 14 | .form-horizontal | 14 | .form-horizontal |
| 15 | = render "shared/clone_panel" | 15 | = render "shared/clone_panel" |
| 16 | 16 | ||
| 17 | - .project-home-extra.clearfix.row | ||
| 18 | - .project-home-desc.col-md-8 | ||
| 19 | - - if @project.description.present? | ||
| 20 | - = @project.description | ||
| 21 | - - if can?(current_user, :admin_project, @project) | ||
| 22 | - – | ||
| 23 | - %strong= link_to 'Edit', edit_project_path | 17 | + .project-home-extra.row |
| 18 | + .col-md-8 | ||
| 19 | + .project-home-desc | ||
| 20 | + - if @project.description.present? | ||
| 21 | + = @project.description | ||
| 22 | + - if can?(current_user, :admin_project, @project) | ||
| 23 | + – | ||
| 24 | + %strong= link_to 'Edit', edit_project_path | ||
| 24 | 25 | ||
| 25 | - unless empty_repo | 26 | - unless empty_repo |
| 26 | - .project-home-links | ||
| 27 | - = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref) | ||
| 28 | - = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project) | ||
| 29 | - = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) | ||
| 30 | - %span.light.prepend-left-20= repository_size | 27 | + .col-md-4 |
| 28 | + .project-home-links | ||
| 29 | + = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref) | ||
| 30 | + = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project) | ||
| 31 | + = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) | ||
| 32 | + %span.light.prepend-left-20= repository_size |
app/views/projects/show.html.haml
| 1 | = render "home_panel" | 1 | = render "home_panel" |
| 2 | 2 | ||
| 3 | .row | 3 | .row |
| 4 | - .col-md-9.hidden-sm | 4 | + .col-md-9 |
| 5 | = render "events/event_last_push", event: @last_push | 5 | = render "events/event_last_push", event: @last_push |
| 6 | = render 'shared/event_filter' | 6 | = render 'shared/event_filter' |
| 7 | .content_list | 7 | .content_list |
| 8 | .loading.hide | 8 | .loading.hide |
| 9 | - .col-md-3.project-side | 9 | + .col-md-3.project-side.hidden-sm |
| 10 | .clearfix | 10 | .clearfix |
| 11 | - if @project.archived? | 11 | - if @project.archived? |
| 12 | .alert | 12 | .alert |