diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-18 16:34:12 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-18 16:34:12 +0000 |
| commit | d0bca4b83ffdffddb8ce04b62d1d3ec071fa9fdd (patch) | |
| tree | 3c4c149165a9e9e0e70b0967456d8f534284b8a1 | |
| parent | 79488092e76d23bce749394e3ac02152d9630826 (diff) | |
| parent | 6ce6fa803821dcbd308297b7b330711d28ca7e71 (diff) | |
| download | gitlab-ce-d0bca4b83ffdffddb8ce04b62d1d3ec071fa9fdd.tar.gz | |
Merge branch 'branch-buttons-size' into 'master'
Fixed size of buttons in branches list
## What does this MR do?
The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags
## What are the relevant issue numbers?
#18677
## Screenshots (if relevant)
See merge request !4735
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 87c732626a6..4bd85061240 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -20,15 +20,15 @@ protected .controls.hidden-xs - if create_mr_button?(@repository.root_ref, branch.name) - = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-grouped btn-xs' do + = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-default' do Merge Request - if branch.name != @repository.root_ref - = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-grouped btn-xs', method: :post, title: "Compare" do + = link_to namespace_project_compare_index_path(@project.namespace, @project, from: @repository.root_ref, to: branch.name), class: 'btn btn-default', method: :post, title: "Compare" do Compare - if can_remove_branch?(@project, branch.name) - = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row has-tooltip', title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do + = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do = icon("trash-o") - if branch.name != @repository.root_ref |