diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 21:53:37 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-13 21:53:37 +0000 |
commit | 352362adaff3217a8b5d727bc11faf2718423a26 (patch) | |
tree | 313f6feced24a7280ba6afcf584b92ccfc835293 | |
parent | 59d7f4c97ff2869824cb5b1b0fbe14c983dab75d (diff) | |
parent | fd84567545d274f29bbcf397c074618d4b300349 (diff) | |
download | gitlab-ce-352362adaff3217a8b5d727bc11faf2718423a26.tar.gz |
Merge branch 'project-plus-icon' into 'master'
Replaced icon for project page dropdown button
Improve for !971
![Screenshot_2015-07-13_23.37.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2b168c6f8a07f33cab4ca8f735646f8a/Screenshot_2015-07-13_23.37.01.png)
See merge request !973
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/buttons/_dropdown.html.haml (renamed from app/views/projects/_dropdown.html.haml) | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 64055a9ccf2..7b6b4b35c8d 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -23,6 +23,6 @@ = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: @ref, format: 'zip'), class: 'btn', rel: 'nofollow' do %i.fa.fa-download - = render 'projects/dropdown' + = render 'projects/buttons/dropdown' = render "shared/clone_panel" diff --git a/app/views/projects/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml index dfdf9fb7ac4..99c2ed62545 100644 --- a/app/views/projects/_dropdown.html.haml +++ b/app/views/projects/buttons/_dropdown.html.haml @@ -1,7 +1,7 @@ - if current_user %span.dropdown %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"} - %i.fa.fa-bars + %i.fa.fa-plus %ul.dropdown-menu - if @project.issues_enabled && can?(current_user, :create_issue, @project) %li @@ -26,7 +26,6 @@ New git branch %li = link_to new_namespace_project_tag_path(@project.namespace, @project) do - %i.fa.fa-tag New git tag |