Browse Source

fix: refine font colors for select options

Signed-off-by: mertmit <mertmit99@gmail.com>
pull/4005/head
mertmit 2 years ago
parent
commit
34779578fc
  1. 22
      packages/nc-gui/components/cell/MultiSelect.vue
  2. 7
      packages/nc-gui/components/cell/SingleSelect.vue

22
packages/nc-gui/components/cell/MultiSelect.vue

@ -147,7 +147,12 @@ watch(isOpen, (n, _o) => {
<a-select-option v-for="op of options" :key="op.id" :value="op.title" @click.stop> <a-select-option v-for="op of options" :key="op.id" :value="op.title" @click.stop>
<a-tag class="rounded-tag" :color="op.color"> <a-tag class="rounded-tag" :color="op.color">
<span <span
:style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{
'color': tinycolor.isReadable(op.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
? '#fff'
: tinycolor.mostReadable(op.color || '#ccc', ['#0b1d05', '#fff']).toHex8String(),
'font-size': '13px',
}"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
> >
{{ op.title }} {{ op.title }}
@ -166,7 +171,17 @@ watch(isOpen, (n, _o) => {
@close="onClose" @close="onClose"
> >
<span <span
:style="{ color: tinycolor.mostReadable((options.find((el) => el.title === val) as SelectOptionType).color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{
'color': tinycolor.isReadable(options.find((el) => el.title === val)?.color || '#ccc', '#fff', {
level: 'AA',
size: 'large',
})
? '#fff'
: tinycolor
.mostReadable(options.find((el) => el.title === val)?.color || '#ccc', ['#0b1d05', '#fff'])
.toHex8String(),
'font-size': '13px',
}"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
> >
{{ val }} {{ val }}
@ -200,8 +215,7 @@ watch(isOpen, (n, _o) => {
color: rgba(0, 0, 0, 0.45); color: rgba(0, 0, 0, 0.45);
} }
.rounded-tag { .rounded-tag {
padding: 0px 12px; @apply py-0 px-[12px] rounded-[12px];
border-radius: 12px;
} }
:deep(.ant-tag) { :deep(.ant-tag) {
@apply "rounded-tag" my-[2px]; @apply "rounded-tag" my-[2px];

7
packages/nc-gui/components/cell/SingleSelect.vue

@ -84,7 +84,12 @@ watch(isOpen, (n, _o) => {
<a-select-option v-for="op of options" :key="op.title" :value="op.title" @click.stop> <a-select-option v-for="op of options" :key="op.title" :value="op.title" @click.stop>
<a-tag class="rounded-tag" :color="op.color"> <a-tag class="rounded-tag" :color="op.color">
<span <span
:style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{
'color': tinycolor.isReadable(op.color || '#ccc', '#fff', { level: 'AA', size: 'large' })
? '#fff'
: tinycolor.mostReadable(op.color || '#ccc', ['#0b1d05', '#fff']).toHex8String(),
'font-size': '13px',
}"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
> >
{{ op.title }} {{ op.title }}

Loading…
Cancel
Save