Replaced the remaining code-fork icons
This commit is contained in:
parent
39018a7445
commit
5bbc322bd3
|
@ -2,6 +2,7 @@
|
||||||
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
|
import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue';
|
||||||
import limitWarning from './limit_warning_component.vue';
|
import limitWarning from './limit_warning_component.vue';
|
||||||
import totalTime from './total_time_component.vue';
|
import totalTime from './total_time_component.vue';
|
||||||
|
import icon from '../../vue_shared/components/icon.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
|
@ -12,6 +13,7 @@
|
||||||
userAvatarImage,
|
userAvatarImage,
|
||||||
totalTime,
|
totalTime,
|
||||||
limitWarning,
|
limitWarning,
|
||||||
|
icon,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
@ -52,7 +54,10 @@
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<span class="merge-request-branch" v-if="mergeRequest.branch">
|
<span class="merge-request-branch" v-if="mergeRequest.branch">
|
||||||
<i class= "fa fa-code-fork"></i>
|
<icon
|
||||||
|
name="fork"
|
||||||
|
:size="16">
|
||||||
|
</icon>
|
||||||
<a :href="mergeRequest.branch.url">{{ mergeRequest.branch.name }}</a>
|
<a :href="mergeRequest.branch.url">{{ mergeRequest.branch.name }}</a>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
import iconBranch from '../svg/icon_branch.svg';
|
import iconBranch from '../svg/icon_branch.svg';
|
||||||
import limitWarning from './limit_warning_component.vue';
|
import limitWarning from './limit_warning_component.vue';
|
||||||
import totalTime from './total_time_component.vue';
|
import totalTime from './total_time_component.vue';
|
||||||
|
import icon from '../../vue_shared/components/icon.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
|
@ -13,6 +14,7 @@
|
||||||
userAvatarImage,
|
userAvatarImage,
|
||||||
totalTime,
|
totalTime,
|
||||||
limitWarning,
|
limitWarning,
|
||||||
|
icon,
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
iconBranch() {
|
iconBranch() {
|
||||||
|
@ -37,7 +39,10 @@
|
||||||
<user-avatar-image :img-src="build.author.avatarUrl"/>
|
<user-avatar-image :img-src="build.author.avatarUrl"/>
|
||||||
<h5 class="item-title">
|
<h5 class="item-title">
|
||||||
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
|
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
|
||||||
<i class="fa fa-code-fork"></i>
|
<icon
|
||||||
|
name="fork"
|
||||||
|
:size="16">
|
||||||
|
</icon>
|
||||||
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
|
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
|
||||||
<span class="icon-branch" v-html="iconBranch"></span>
|
<span class="icon-branch" v-html="iconBranch"></span>
|
||||||
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
|
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
import iconBranch from '../svg/icon_branch.svg';
|
import iconBranch from '../svg/icon_branch.svg';
|
||||||
import limitWarning from './limit_warning_component.vue';
|
import limitWarning from './limit_warning_component.vue';
|
||||||
import totalTime from './total_time_component.vue';
|
import totalTime from './total_time_component.vue';
|
||||||
|
import icon from '../../vue_shared/components/icon.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
|
@ -12,6 +13,7 @@
|
||||||
components: {
|
components: {
|
||||||
totalTime,
|
totalTime,
|
||||||
limitWarning,
|
limitWarning,
|
||||||
|
icon,
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
iconBuildStatus() {
|
iconBuildStatus() {
|
||||||
|
@ -40,7 +42,10 @@
|
||||||
<a :href="build.url" class="item-build-name">{{ build.name }}</a>
|
<a :href="build.url" class="item-build-name">{{ build.name }}</a>
|
||||||
·
|
·
|
||||||
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
|
<a :href="build.url" class="pipeline-id">#{{ build.id }}</a>
|
||||||
<i class="fa fa-code-fork"></i>
|
<icon
|
||||||
|
name="fork"
|
||||||
|
:size="16">
|
||||||
|
</icon>
|
||||||
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
|
<a :href="build.branch.url" class="ref-name">{{ build.branch.name }}</a>
|
||||||
<span class="icon-branch" v-html="iconBranch"></span>
|
<span class="icon-branch" v-html="iconBranch"></span>
|
||||||
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
|
<a :href="build.commitUrl" class="commit-sha">{{ build.shortSha }}</a>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script>
|
<script>
|
||||||
import tooltip from '../../vue_shared/directives/tooltip';
|
import tooltip from '../../vue_shared/directives/tooltip';
|
||||||
import Icon from '../../vue_shared/components/icon.vue';
|
import icon from '../../vue_shared/components/icon.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
tooltip,
|
tooltip,
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
Icon,
|
icon,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import tooltip from '../../vue_shared/directives/tooltip';
|
import tooltip from '../../vue_shared/directives/tooltip';
|
||||||
import { pluralize } from '../../lib/utils/text_utility';
|
import { pluralize } from '../../lib/utils/text_utility';
|
||||||
import Icon from '../../vue_shared/components/icon.vue';
|
import icon from '../../vue_shared/components/icon.vue';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'MRWidgetHeader',
|
name: 'MRWidgetHeader',
|
||||||
|
@ -11,7 +11,7 @@ export default {
|
||||||
tooltip,
|
tooltip,
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
Icon,
|
icon,
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
shouldShowCommitsBehindText() {
|
shouldShowCommitsBehindText() {
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
.commit-sha,
|
.commit-sha,
|
||||||
.commit-info {
|
.commit-info {
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
|
|
||||||
|
.fork-svg {
|
||||||
|
margin-right: 4px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ref-name {
|
.ref-name {
|
||||||
|
@ -79,7 +83,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.limit-icon {
|
.limit-icon {
|
||||||
margin: 0 8px;
|
margin: 0 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.limit-message {
|
.limit-message {
|
||||||
|
|
|
@ -725,7 +725,5 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.fork-sprite {
|
.fork-sprite {
|
||||||
width: 12px;
|
|
||||||
height: 12px;
|
|
||||||
margin-right: -5px;
|
margin-right: -5px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,6 +39,10 @@
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
|
||||||
|
svg {
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.next-run-cell {
|
.next-run-cell {
|
||||||
|
|
|
@ -63,7 +63,7 @@ module CommitsHelper
|
||||||
# Returns a link formatted as a commit branch link
|
# Returns a link formatted as a commit branch link
|
||||||
def commit_branch_link(url, text)
|
def commit_branch_link(url, text)
|
||||||
link_to(url, class: 'label label-gray ref-name branch-link') do
|
link_to(url, class: 'label label-gray ref-name branch-link') do
|
||||||
icon('code-fork', class: 'append-right-5') + "#{text}"
|
sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
%li{ class: "js-branch-#{branch.name}" }
|
%li{ class: "js-branch-#{branch.name}" }
|
||||||
%div
|
%div
|
||||||
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated ref-name' do
|
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated ref-name' do
|
||||||
= sprite_icon('fork', size: 8)
|
= sprite_icon('fork', size: 12)
|
||||||
= branch.name
|
= branch.name
|
||||||
|
|
||||||
- if branch.name == @repository.root_ref
|
- if branch.name == @repository.root_ref
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
|
.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
|
||||||
.limit-icon
|
.limit-icon
|
||||||
- if objects == :branch
|
- if objects == :branch
|
||||||
= icon('code-fork')
|
= sprite_icon('fork', size: 12)
|
||||||
- else
|
- else
|
||||||
= icon('tag')
|
= icon('tag')
|
||||||
.limit-message
|
.limit-message
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
.branch-commit
|
.branch-commit
|
||||||
- if deployment.ref
|
- if deployment.ref
|
||||||
%span.icon-container
|
%span.icon-container
|
||||||
= deployment.tag? ? icon('tag') : icon('code-fork')
|
= deployment.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite')
|
||||||
= link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name"
|
= link_to deployment.ref, project_ref_path(@project, deployment.ref), class: "ref-name"
|
||||||
.icon-container.commit-icon
|
.icon-container.commit-icon
|
||||||
= custom_icon("icon_commit")
|
= custom_icon("icon_commit")
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
- if @forked_project && !@forked_project.saved?
|
- if @forked_project && !@forked_project.saved?
|
||||||
.alert.alert-danger.alert-block
|
.alert.alert-danger.alert-block
|
||||||
%h4
|
%h4
|
||||||
%i.fa.fa-code-fork
|
= sprite_icon('fork', size: 16)
|
||||||
Fork Error!
|
Fork Error!
|
||||||
%p
|
%p
|
||||||
You tried to fork
|
You tried to fork
|
||||||
|
@ -21,5 +21,4 @@
|
||||||
|
|
||||||
%p
|
%p
|
||||||
= link_to new_project_fork_path(@project), title: "Fork", class: "btn" do
|
= link_to new_project_fork_path(@project), title: "Fork", class: "btn" do
|
||||||
%i.fa.fa-code-fork
|
|
||||||
Try to fork again
|
Try to fork again
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
- if ref
|
- if ref
|
||||||
- if generic_commit_status.ref
|
- if generic_commit_status.ref
|
||||||
.icon-container
|
.icon-container
|
||||||
= generic_commit_status.tags.any? ? icon('tag') : icon('code-fork')
|
= generic_commit_status.tags.any? ? icon('tag') : sprite_icon('fork', size: 10)
|
||||||
= link_to generic_commit_status.ref, project_commits_path(generic_commit_status.project, generic_commit_status.ref)
|
= link_to generic_commit_status.ref, project_commits_path(generic_commit_status.project, generic_commit_status.ref)
|
||||||
- else
|
- else
|
||||||
.light none
|
.light none
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
%span.project-ref-path
|
%span.project-ref-path
|
||||||
|
|
||||||
= 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', css_class: 'fork-sprite')
|
= sprite_icon('fork', size: 12, css_class: 'fork-sprite')
|
||||||
= merge_request.target_branch
|
= merge_request.target_branch
|
||||||
- if merge_request.labels.any?
|
- if merge_request.labels.any?
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
%td
|
%td
|
||||||
= pipeline_schedule.description
|
= pipeline_schedule.description
|
||||||
%td.branch-name-cell
|
%td.branch-name-cell
|
||||||
= icon('code-fork')
|
= sprite_icon('fork', size: 12)
|
||||||
- if pipeline_schedule.ref.present?
|
- if pipeline_schedule.ref.present?
|
||||||
= link_to pipeline_schedule.ref, project_ref_path(@project, pipeline_schedule.ref), class: "ref-name"
|
= link_to pipeline_schedule.ref, project_ref_path(@project, pipeline_schedule.ref), class: "ref-name"
|
||||||
%td
|
%td
|
||||||
|
|
|
@ -10,7 +10,7 @@ describe('Commit component', () => {
|
||||||
CommitComponent = Vue.extend(commitComp);
|
CommitComponent = Vue.extend(commitComp);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should render a code-fork icon if it does not represent a tag', () => {
|
it('should render a fork icon if it does not represent a tag', () => {
|
||||||
component = new CommitComponent({
|
component = new CommitComponent({
|
||||||
propsData: {
|
propsData: {
|
||||||
tag: false,
|
tag: false,
|
||||||
|
@ -30,7 +30,7 @@ describe('Commit component', () => {
|
||||||
},
|
},
|
||||||
}).$mount();
|
}).$mount();
|
||||||
|
|
||||||
expect(component.$el.querySelector('.icon-container i').classList).toContain('fa-code-fork');
|
expect(component.$el.querySelector('.icon-container').children).toContain('svg');
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Given all the props', () => {
|
describe('Given all the props', () => {
|
||||||
|
|
Loading…
Reference in New Issue