Commit c18f37e9 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'dimitrieh-master-patch-65978' into 'master'

Replace fa-plus icons with GitLab SVG plus icon

Closes #225899

See merge request gitlab-org/gitlab!36972
parents 2a11731b c457e384
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
- if show_menu - if show_menu
.project-action-button.dropdown.inline< .project-action-button.dropdown.inline<
%a.btn.dropdown-toggle.has-tooltip.qa-create-new-dropdown{ href: '#', title: _('Create new...'), 'data-toggle' => 'dropdown', 'data-container' => 'body', 'aria-label' => _('Create new...'), 'data-display' => 'static' } %a.btn.btn-default.gl-button.dropdown-toggle.has-tooltip.qa-create-new-dropdown{ href: '#', title: _('Create new...'), 'data-toggle' => 'dropdown', 'data-container' => 'body', 'aria-label' => _('Create new...'), 'data-display' => 'static' }
= icon('plus') = sprite_icon('plus', css_class: 'gl-icon')
= icon("caret-down") = sprite_icon("chevron-down", css_class: 'gl-icon')
%ul.dropdown-menu.dropdown-menu-right.project-home-dropdown %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
- if can_create_issue || merge_project || can_create_project_snippet - if can_create_issue || merge_project || can_create_project_snippet
%li.dropdown-header= _('This project') %li.dropdown-header= _('This project')
......
---
title: Replace fa-plus icons with GitLab SVG plus icon
merge_request: 36972
author:
type: changed
<script> <script>
import { GlLink } from '@gitlab/ui'; import { GlLink, GlIcon } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import AddIssuableForm from './add_issuable_form.vue'; import AddIssuableForm from './add_issuable_form.vue';
import RelatedIssuesList from './related_issues_list.vue'; import RelatedIssuesList from './related_issues_list.vue';
...@@ -15,6 +15,7 @@ export default { ...@@ -15,6 +15,7 @@ export default {
components: { components: {
Icon, Icon,
GlLink, GlLink,
GlIcon,
AddIssuableForm, AddIssuableForm,
RelatedIssuesList, RelatedIssuesList,
}, },
...@@ -160,7 +161,7 @@ export default { ...@@ -160,7 +161,7 @@ export default {
data-qa-selector="related_issues_plus_button" data-qa-selector="related_issues_plus_button"
@click="$emit('toggleAddRelatedIssuesForm', $event)" @click="$emit('toggleAddRelatedIssuesForm', $event)"
> >
<i class="fa fa-plus" aria-hidden="true"></i> <gl-icon name="plus" aria-hidden="true" />
</button> </button>
</div> </div>
</h3> </h3>
......
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