diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-19 15:56:29 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-19 16:28:03 -0500 |
| commit | 3c8d209e16c606c5122d5aee455d051e65c6dab0 (patch) | |
| tree | 7b90bb1d41138a516b84f7999fdd98110805eb2c | |
| parent | 5436bfa82230f7ba4532a2b09d035cfc733e8657 (diff) | |
| download | gitlab-ce-3c8d209e16c606c5122d5aee455d051e65c6dab0.tar.gz | |
Redesign sublevel nav links; vertically align project image; fix spacing
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 46981fd0d2c..cb9bef7214d 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -48,15 +48,20 @@ } } + .cover-title { + margin-bottom: 0; + } + .project-image-container { @include make-sm-column(1); max-width: 86px; min-width: 86px; padding-right: 0; + margin: 11px 0; @media (max-width: $screen-md-max) { padding-left: 0; - margin-bottom: 10px; + margin: 0 0 10px; max-width: none; min-width: none; diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 61f739ad1d4..59a9519ca11 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -17,17 +17,16 @@ %ul.nav %li = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do - = pluralize(number_with_delimiter(@project.commit_count), 'commit') + #{'Commit'.pluralize(@project.commit_count)} (#{number_with_delimiter(@project.commit_count)}) %li = link_to namespace_project_branches_path(@project.namespace, @project) do - = pluralize(number_with_delimiter(@repository.branch_names.count), 'branch') + #{'Branch'.pluralize(@repository.branch_names.count)} (#{number_with_delimiter(@repository.branch_names.count)}) %li = link_to namespace_project_tags_path(@project.namespace, @project) do - = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag') - + #{'Tag'.pluralize(@repository.tag_names.count)} (#{number_with_delimiter(@repository.tag_names.count)}) %li = link_to project_files_path(@project) do - = repository_size + Files (#{repository_size}) - if default_project_view != 'readme' && @repository.readme %li |