Skip to content

Commit bec6145

Browse files
authored
Merge pull request #318 from nextcloud/enh/noid/icons
Use outline icons where it makes sense
2 parents 91b16e9 + f9de626 commit bec6145

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

src/components/AdminSettings.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@
3232
v-model:value="rules[id]"
3333
:is-admin="isAdmin"
3434
class="approval-rule"
35-
delete-icon="icon-delete"
3635
@input="onRuleInput(id, $event)"
3736
@add-tag="onAddTagClick">
3837
<template #extra-buttons>
3938
<NcButton
4039
type="error"
4140
@click="onRuleDelete(id)">
4241
<template #icon>
43-
<DeleteIcon :size="20" />
42+
<DeleteOutlineIcon :size="20" />
4443
</template>
4544
{{ t('approval', 'Delete workflow') }}
4645
</NcButton>
@@ -119,7 +118,7 @@
119118
<script>
120119
import CheckIcon from 'vue-material-design-icons/Check.vue'
121120
import TagIcon from 'vue-material-design-icons/Tag.vue'
122-
import DeleteIcon from 'vue-material-design-icons/Delete.vue'
121+
import DeleteOutlineIcon from 'vue-material-design-icons/DeleteOutline.vue'
123122
import PlusIcon from 'vue-material-design-icons/Plus.vue'
124123
125124
import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
@@ -139,7 +138,7 @@ export default {
139138
CheckIcon,
140139
TagIcon,
141140
PlusIcon,
142-
DeleteIcon,
141+
DeleteOutlineIcon,
143142
ApprovalRule,
144143
NcEmptyContent,
145144
NcButton,

src/components/ApprovalRule.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ export default {
159159
type: Object,
160160
required: true,
161161
},
162-
deleteIcon: {
163-
type: String,
164-
default: '',
165-
},
166162
focus: {
167163
type: Boolean,
168164
default: false,

src/files/actions/inlineAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import PendingIconSvg from '@mdi/svg/svg/dots-horizontal-circle.svg?raw'
6+
import PendingIconSvg from '@mdi/svg/svg/dots-horizontal-circle-outline.svg?raw'
77
import ApprovedIconSvg from '../../../img/checkmark-green.svg?raw'
88
import RejectedIconSvg from '../../../img/close-red.svg?raw'
99
import { Permission, FileAction } from '@nextcloud/files'

0 commit comments

Comments
 (0)