diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-17 10:37:27 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-17 10:37:31 +0100 |
| commit | 6ce6fa803821dcbd308297b7b330711d28ca7e71 (patch) | |
| tree | dfa6f974bc9682e0c33491862bc693e7ea75bf0c | |
| parent | f011b86beb89557afdaf2b0ec5ae904d0be237d8 (diff) | |
| download | gitlab-ce-branch-buttons-size.tar.gz | |
Fixed size of buttons in branches listbranch-buttons-size
Closes #18677
| -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 |