diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-05 19:38:53 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-05 19:38:53 +0300 |
| commit | cecfbd55deaca45a61d970e2bea4e44eab2b3dc3 (patch) | |
| tree | 58ceb0f451ed34d4ea5435e62310c4f7fc6c2d99 | |
| parent | 3b0cf49f33aa972428113393ffc30279fb6857cb (diff) | |
| download | gitlab-ce-cecfbd55deaca45a61d970e2bea4e44eab2b3dc3.tar.gz | |
Restlye project sidebar a bit to make it more clear
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/_aside.html.haml | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 0ab096112cf..afa8aa24ee4 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -203,11 +203,16 @@ ul.nav.nav-projects-tabs { .well { h4 { font-weight: normal; + margin: 0; } .nav-pills a { padding: 10px; } + + .nav { + margin: 10px 0; + } } } diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml index a5f127afc20..1a7ab74c93a 100644 --- a/app/views/projects/_aside.html.haml +++ b/app/views/projects/_aside.html.haml @@ -10,14 +10,14 @@ %li= link_to pluralize(number_with_delimiter(@repository.branch_names.count), 'branch'), namespace_project_branches_path(@project.namespace, @project) %li= link_to pluralize(number_with_delimiter(@repository.tag_names.count), 'tag'), namespace_project_tags_path(@project.namespace, @project) - %hr - = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-sm' do - %i.fa.fa-exchange - Compare code + .actions + = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: @ref || @repository.root_ref), class: 'btn btn-sm' do + %i.fa.fa-exchange + Compare code - - if can?(current_user, :download_code, @project) - - = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm' + - if can?(current_user, :download_code, @project) + + = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm' - unless @project.empty_repo? .well @@ -35,10 +35,10 @@ %li = link_to license_url(@project) do License - %hr - = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm' do - %i.fa.fa-fw.fa-exclamation-circle - New issue + .actions + = link_to url_for_new_issue(@project, only_path: true), title: "New Issue", class: 'btn btn-sm' do + %i.fa.fa-fw.fa-exclamation-circle + New issue |