Skip to content
Snippets Groups Projects
Commit 1e8de503 authored by Jose Ivan Vargas Lopez's avatar Jose Ivan Vargas Lopez
Browse files

Replaced some fork icons instances and fixed the Icon component on the MR Widget

parent a623ddb0
No related branches found
No related tags found
No related merge requests found
import tooltip from '../../vue_shared/directives/tooltip';
import { pluralize } from '../../lib/utils/text_utility';
import { spriteIcon } from '../../lib/utils/common_utils';
import Icon from '../../vue_shared/components/icon.vue';
 
export default {
name: 'MRWidgetHeader',
Loading
Loading
@@ -10,6 +10,9 @@ export default {
directives: {
tooltip,
},
components: {
Icon,
},
computed: {
shouldShowCommitsBehindText() {
return this.mr.divergedCommitsCount > 0;
Loading
Loading
@@ -26,9 +29,6 @@ export default {
gfm: `\`${this.mr.sourceBranch}\``,
});
},
downloadIcon() {
return spriteIcon('download');
},
},
methods: {
isBranchTitleLong(branchTitle) {
Loading
Loading
@@ -85,9 +85,9 @@ export default {
data-toggle="dropdown"
aria-label="Download as"
role="button">
<i
v-html="downloadIcon">
</i>
<icon
name="download">
</icon>
<i
class="fa fa-caret-down"
aria-hidden="true">
Loading
Loading
Loading
Loading
@@ -723,3 +723,9 @@
font-size: 16px;
}
}
.fork-sprite {
width: 12px;
height: 12px;
margin-right: -5px;
}
Loading
Loading
@@ -143,6 +143,12 @@
fill: $gl-text-color-secondary;
}
 
.sprite {
width: 12px;
height: 12px;
fill: $gl-text-color;
}
.fa {
font-size: 12px;
color: $gl-text-color;
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
.file-holder-bottom-radius.file-holder.file.append-bottom-default
.js-file-title.file-title.clearfix{ data: { current_action: action } }
.editor-ref
= icon('code-fork')
= sprite_icon('fork')
= ref
%span.editor-file-name
- if current_action?(:edit) || current_action?(:update)
Loading
Loading
Loading
Loading
@@ -8,7 +8,8 @@
%li{ class: "js-branch-#{branch.name}" }
%div
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated ref-name' do
= icon('code-fork', class: 'append-right-5') + "#{branch.name}"
= sprite_icon('fork', size: 8)
= branch.name
&nbsp;
- if branch.name == @repository.root_ref
%span.label.label-primary default
Loading
Loading
Loading
Loading
@@ -22,7 +22,7 @@
- if ref
- if job.ref
.icon-container
= job.tag? ? icon('tag') : icon('code-fork')
= job.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite')
= link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name"
- else
.light none
Loading
Loading
Loading
Loading
@@ -30,7 +30,7 @@
%span.project-ref-path
&nbsp;
= link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name' do
= icon('code-fork')
= sprite_icon('fork', css_class: 'fork-sprite')
= merge_request.target_branch
- if merge_request.labels.any?
&nbsp;
Loading
Loading
Loading
Loading
@@ -52,7 +52,7 @@
= render_project_pipeline_status(project.pipeline_status)
- if forks
%span.prepend-left-10
= icon('code-fork')
= sprite_icon('fork')
= number_with_delimiter(project.forks_count)
- if stars
%span.prepend-left-10
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment