Commit f1d4712e authored by Clement Ho's avatar Clement Ho

Use icon svg instead of fontawesome

parent 36586285
...@@ -33,19 +33,16 @@ export default { ...@@ -33,19 +33,16 @@ export default {
{{ title }} {{ title }}
</a> </a>
<div class="block text-secondary"> <div class="block text-secondary">
<i <icon
ref="stateIcon"
v-if="hasState" v-if="hasState"
v-tooltip v-tooltip
class="fa" :css-classes="iconClass"
:class="{ :name="iconName"
'issue-token-state-icon-open fa-circle-o': isOpen, :size="12"
'issue-token-state-icon-closed fa-minus': isClosed,
}"
:title="stateTitle" :title="stateTitle"
:aria-label="state" :aria-label="state"
> />
</i>{{ displayReference }} {{ displayReference }}
</div> </div>
</div> </div>
<button <button
......
...@@ -69,18 +69,15 @@ export default { ...@@ -69,18 +69,15 @@ export default {
'issue-token-reference': isCondensed, 'issue-token-reference': isCondensed,
'issuable-info': !isCondensed, 'issuable-info': !isCondensed,
}"> }">
<i <icon
ref="stateIcon"
v-if="hasState" v-if="hasState"
v-tooltip v-tooltip
class="fa" :css-classes="iconClass"
:class="{ :name="iconName"
'issue-token-state-icon-open fa-circle-o': isOpen, :size="12"
'issue-token-state-icon-closed fa-minus': isClosed,
}"
:title="stateTitle" :title="stateTitle"
:aria-label="state" :aria-label="state"
> />
</i>{{ displayReference }} </i>{{ displayReference }}
</component> </component>
</component> </component>
......
import tooltip from '../../../vue_shared/directives/tooltip'; import tooltip from '../../../vue_shared/directives/tooltip';
import icon from '../../../vue_shared/components/icon.vue';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
const mixins = { const mixins = {
...@@ -42,6 +43,9 @@ const mixins = { ...@@ -42,6 +43,9 @@ const mixins = {
default: false, default: false,
}, },
}, },
components: {
icon,
},
directives: { directives: {
tooltip, tooltip,
}, },
...@@ -58,6 +62,12 @@ const mixins = { ...@@ -58,6 +62,12 @@ const mixins = {
hasTitle() { hasTitle() {
return this.title.length > 0; return this.title.length > 0;
}, },
iconName() {
return this.isOpen ? 'issue-open-m' : 'cut';
},
iconClass() {
return this.isOpen ? 'issue-token-state-icon-open' : 'issue-token-state-icon-closed';
},
computedLinkElementType() { computedLinkElementType() {
return this.path.length > 0 ? 'a' : 'span'; return this.path.length > 0 ? 'a' : 'span';
}, },
......
...@@ -374,18 +374,11 @@ ul.related-merge-requests > li { ...@@ -374,18 +374,11 @@ ul.related-merge-requests > li {
} }
} }
@mixin issue-token-state-icon {
margin-right: 0.35em;
font-size: 0.9em;
}
.issue-token-state-icon-open { .issue-token-state-icon-open {
@include issue-token-state-icon;
color: $green-600; color: $green-600;
} }
.issue-token-state-icon-closed { .issue-token-state-icon-closed {
@include issue-token-state-icon;
color: $red-600; color: $red-600;
} }
......
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