summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components/issue
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-11-16 16:44:16 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-11-16 16:44:16 +0000
commitd0f7e4df349b8095eb6ea9d7b6b9b234e0c5dd58 (patch)
treebd1d6c40ff93f2418a5bb6f8edfaa30ecbccbe3b /app/assets/javascripts/vue_shared/components/issue
parentc5720382e67b18258c71d717c0e8073cc322b308 (diff)
downloadgitlab-ce-d0f7e4df349b8095eb6ea9d7b6b9b234e0c5dd58.tar.gz
Resolve "lock/confidential issuable sidebar custom svg icons iteration"
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/issue')
-rw-r--r--app/assets/javascripts/vue_shared/components/issue/issue_warning.vue29
1 files changed, 18 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue b/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
index 16c0a8efcd2..564fc5029af 100644
--- a/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
+++ b/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
@@ -1,4 +1,6 @@
<script>
+ import Icon from '../../../vue_shared/components/icon.vue';
+
export default {
props: {
isLocked: {
@@ -14,12 +16,16 @@
},
},
+ components: {
+ Icon,
+ },
+
computed: {
- iconClass() {
- return {
- 'fa-eye-slash': this.isConfidential,
- 'fa-lock': this.isLocked,
- };
+ warningIcon() {
+ if (this.isConfidential) return 'eye-slash';
+ if (this.isLocked) return 'lock';
+
+ return '';
},
isLockedAndConfidential() {
@@ -30,12 +36,13 @@
</script>
<template>
<div class="issuable-note-warning">
- <i
- aria-hidden="true"
- class="fa icon"
- :class="iconClass"
- v-if="!isLockedAndConfidential"
- ></i>
+ <icon
+ :name="warningIcon"
+ :size="16"
+ class="icon inline"
+ aria-hidden="true"
+ v-if="!isLockedAndConfidential">
+ </icon>
<span v-if="isLockedAndConfidential">
{{ __('This issue is confidential and locked.') }}