Commit a19a6cb6 authored by Michael Le's avatar Michael Le Committed by Miguel Rincon

Use 'branch' icon instead of 'fork'

Show ‘branch’ icon instead of a ‘fork’ icon when branch names are being displayed.

Changelog: changed
parent 8ce11592
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.file-holder-bottom-radius.file-holder.file.gl-mb-3 .file-holder-bottom-radius.file-holder.file.gl-mb-3
.js-file-title.file-title.gl-display-flex.gl-align-items-center.clearfix{ data: { current_action: action } } .js-file-title.file-title.gl-display-flex.gl-align-items-center.clearfix{ data: { current_action: action } }
.editor-ref.block-truncated.has-tooltip{ title: ref } .editor-ref.block-truncated.has-tooltip{ title: ref }
= sprite_icon('fork', size: 12) = sprite_icon('branch', size: 12)
= ref = ref
- if current_action?(:edit) || current_action?(:update) - if current_action?(:edit) || current_action?(:update)
%span.float-left.gl-mr-3 %span.float-left.gl-mr-3
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%li{ class: "branch-item js-branch-item js-branch-#{branch.name}", data: { name: branch.name } } %li{ class: "branch-item js-branch-item js-branch-#{branch.name}", data: { name: branch.name } }
.branch-info .branch-info
.branch-title .branch-title
= sprite_icon('fork', size: 12, css_class: 'gl-flex-shrink-0') = sprite_icon('branch', size: 12, css_class: 'gl-flex-shrink-0')
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3 qa-branch-name' do = link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3 qa-branch-name' do
= branch.name = branch.name
- if branch.name == @repository.root_ref - if branch.name == @repository.root_ref
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
%span.project-ref-path.has-tooltip{ title: _('Target branch') } %span.project-ref-path.has-tooltip{ title: _('Target branch') }
   
= link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name' do = link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name' do
= sprite_icon('fork', size: 12, css_class: 'fork-sprite') = sprite_icon('branch', size: 12, css_class: 'fork-sprite')
= merge_request.target_branch = merge_request.target_branch
- if merge_request.labels.any? - if merge_request.labels.any?
   
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment