Skip to content

Commit f9ccaac

Browse files
authored
Merge pull request #7219 from nextcloud-libraries/backport/7217/stable8
[stable8] fix(NcColorPicker): use proper directional arrow icon for submit
2 parents 7a98918 + eaa43ab commit f9ccaac

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

src/components/NcColorPicker/NcColorPicker.vue

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,13 @@ export default {
156156
<div v-if="!advanced" class="color-picker__simple">
157157
<label v-for="({ color, name }, index) in normalizedPalette"
158158
:key="index"
159-
:style="{ backgroundColor: color }"
160159
class="color-picker__simple-color-circle"
161-
:class="{ 'color-picker__simple-color-circle--active' : color === currentColor }">
162-
<Check v-if="color === currentColor" :size="20" :fill-color="contrastColor" />
160+
:class="{ 'color-picker__simple-color-circle--active' : color === currentColor }"
161+
:style="{
162+
backgroundColor: color,
163+
color: contrastColor,
164+
}">
165+
<NcIconSvgWrapper v-if="color === currentColor" :path="mdiCheck" />
163166
<input type="radio"
164167
class="hidden-visually"
165168
:aria-label="name"
@@ -181,15 +184,15 @@ export default {
181184
variant="tertiary"
182185
@click="handleBack">
183186
<template #icon>
184-
<ArrowLeft :size="20" />
187+
<NcIconSvgWrapper directional :path="mdiArrowLeft" />
185188
</template>
186189
</NcButton>
187190
<NcButton v-else
188191
:aria-label="ariaMore"
189192
variant="tertiary"
190193
@click="handleMoreSettings">
191194
<template #icon>
192-
<DotsHorizontal :size="20" />
195+
<NcIconSvgWrapper :path="mdiDotsHorizontal" />
193196
</template>
194197
</NcButton>
195198
<NcButton variant="primary"
@@ -203,32 +206,26 @@ export default {
203206
</template>
204207

205208
<script>
209+
import { mdiArrowLeft, mdiCheck, mdiDotsHorizontal } from '@mdi/js'
210+
import { useVModel } from '@vueuse/core'
211+
import { Chrome } from 'vue-color'
206212
import NcButton from '../NcButton/index.js'
213+
import NcIconSvgWrapper from '../NcIconSvgWrapper/index.js'
207214
import NcPopover from '../NcPopover/index.js'
208-
import { t } from '../../l10n.js'
215+
import { useModelMigration } from '../../composables/useModelMigration.ts'
209216
import { defaultPalette } from '../../utils/GenColors.js'
210-
211217
import GenRandomId from '../../utils/GenRandomId.js'
212-
213-
import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
214-
import Check from 'vue-material-design-icons/Check.vue'
215-
import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
216-
217-
import { Chrome } from 'vue-color'
218-
import { useModelMigration } from '../../composables/useModelMigration.ts'
219-
import { useVModel } from '@vueuse/core'
218+
import { t } from '../../l10n.js'
220219
221220
const HEX_REGEX = /^#([a-f0-9]{3}|[a-f0-9]{6})$/i
222221
223222
export default {
224223
name: 'NcColorPicker',
225224
226225
components: {
227-
ArrowLeft,
228-
Check,
229226
Chrome,
230-
DotsHorizontal,
231227
NcButton,
228+
NcIconSvgWrapper,
232229
NcPopover,
233230
},
234231
@@ -342,6 +339,9 @@ export default {
342339
const modelOpen = useVModel(props, 'open', emit)
343340
344341
return {
342+
mdiArrowLeft,
343+
mdiCheck,
344+
mdiDotsHorizontal,
345345
model,
346346
modelOpen,
347347
}

0 commit comments

Comments
 (0)