Skip to content

Commit

Permalink
modify style
Browse files Browse the repository at this point in the history
  • Loading branch information
mayswind committed Aug 6, 2023
1 parent 6b6b9c6 commit a25690c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
11 changes: 7 additions & 4 deletions src/components/desktop/ColorSelect.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<v-select
density="comfortable"
item-title="icon"
item-value="id"
persistent-placeholder
Expand All @@ -9,8 +10,8 @@
@update:menu="onMenuStateChanged"
>
<template #selection="{ item }">
<v-label>
<v-icon :icon="icons.square" :color="`#${item.raw}`" />
<v-label style="padding-top: 3px">
<v-icon size="28" :icon="icons.square" :color="`#${item.raw}`" />
</v-label>
</template>

Expand All @@ -21,11 +22,13 @@
:key="idx" v-for="(row, idx) in allColorRows">
<div class="text-center" :key="colorInfo.color" v-for="colorInfo in row">
<div class="cursor-pointer" @click="color = colorInfo.color">
<v-icon class="ma-2" :icon="icons.square" :color="`#${colorInfo.color}`" v-if="!modelValue || modelValue !== colorInfo.color" />
<v-icon class="ma-2" size="28"
:icon="icons.square" :color="`#${colorInfo.color}`"
v-if="!modelValue || modelValue !== colorInfo.color" />
<v-badge class="right-bottom-icon" color="primary"
location="bottom right" offset-x="8" offset-y="8" :icon="icons.checked"
v-if="modelValue && modelValue === colorInfo.color">
<v-icon class="ma-2" :icon="icons.square" :color="`#${colorInfo.color}`" />
<v-icon class="ma-2" size="28" :icon="icons.square" :color="`#${colorInfo.color}`" />
</v-badge>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/desktop/IconSelect.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<v-select
density="comfortable"
item-title="icon"
item-value="id"
persistent-placeholder
Expand All @@ -10,7 +11,7 @@
>
<template #selection="{ item }">
<v-label>
<ItemIcon icon-type="category" size="23px" :icon-id="icon" :color="color" />
<ItemIcon icon-type="category" :icon-id="icon" :color="color" />
</v-label>
</template>

Expand Down
2 changes: 1 addition & 1 deletion src/views/desktop/categories/list/dialogs/EditDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<v-progress-circular indeterminate size="22" class="ml-2" v-if="loading"></v-progress-circular>
</v-toolbar-title>
</v-toolbar>
<v-card-text class="pa-4 mt-2">
<v-card-text class="px-5 pt-7 pb-5">
<v-row>
<v-col cols="12" md="12">
<v-text-field
Expand Down

0 comments on commit a25690c

Please sign in to comment.