summaryrefslogtreecommitdiff
path: root/app/views/projects/branches
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-04-30 22:28:49 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-30 22:28:49 +0000
commit8414129873f305c6e08dcd5da9dae00ca0abff2c (patch)
tree0e4740a50444dd63069242bb0a26e617ead550c4 /app/views/projects/branches
parent2f7b71df7619768220657ed47c7737f4c3e19e90 (diff)
downloadgitlab-ce-8414129873f305c6e08dcd5da9dae00ca0abff2c.tar.gz
Fixed inconsistent protected branch pill baseline
Diffstat (limited to 'app/views/projects/branches')
-rw-r--r--app/views/projects/branches/_branch.html.haml11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index d0c01f95cb7..0e012b5a216 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -8,18 +8,17 @@
%li{ class: "branch-item js-branch-#{branch.name}" }
.branch-info
.branch-title
- = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name' do
- = sprite_icon('fork', size: 12)
+ = sprite_icon('fork', size: 12)
+ = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name prepend-left-8' do
= branch.name
- &nbsp;
- if branch.name == @repository.root_ref
- %span.label.label-primary default
+ %span.label.label-primary.prepend-left-5 default
- elsif merged
- %span.label.label-info.has-tooltip{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
+ %span.label.label-info.has-tooltip.prepend-left-5{ title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref } }
= s_('Branches|merged')
- if protected_branch?(@project, branch)
- %span.label.label-success
+ %span.label.label-success.prepend-left-5
= s_('Branches|protected')
.block-truncated