feat: color the color button icon instead of the button itself
This commit is contained in:
parent
51c806c12b
commit
bdf992c9bf
2 changed files with 20 additions and 6 deletions
|
@ -9,9 +9,16 @@
|
|||
}
|
||||
]"
|
||||
>
|
||||
<icon :icon="icon" v-if="showIconOnly"/>
|
||||
<icon
|
||||
v-if="showIconOnly"
|
||||
:icon="icon"
|
||||
:style="{'color': iconColor !== '' ? iconColor : false}"
|
||||
/>
|
||||
<span class="icon is-small" v-else-if="icon !== ''">
|
||||
<icon :icon="icon"/>
|
||||
<icon
|
||||
:icon="icon"
|
||||
:style="{'color': iconColor !== '' ? iconColor : false}"
|
||||
/>
|
||||
</span>
|
||||
<slot />
|
||||
</BaseButton>
|
||||
|
@ -42,6 +49,10 @@ const props = defineProps({
|
|||
type: [String, Array],
|
||||
default: '',
|
||||
},
|
||||
iconColor: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
loading: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
|
|
|
@ -378,9 +378,8 @@
|
|||
@click="setFieldActive('color')"
|
||||
variant="secondary"
|
||||
icon="fill-drip"
|
||||
:icon-color="color"
|
||||
v-shortcut="'c'"
|
||||
:class="{'has-light-text': color !== TASK_DEFAULT_COLOR && !colorIsDark(color)}"
|
||||
:style="{'background-color': color !== TASK_DEFAULT_COLOR ? color : false}"
|
||||
>
|
||||
{{ $t('task.detail.actions.color') }}
|
||||
</x-button>
|
||||
|
@ -600,9 +599,13 @@ export default defineComponent({
|
|||
return this.$route.name.includes('kanban')
|
||||
},
|
||||
color() {
|
||||
return this.task.getHexColor
|
||||
const color = this.task.getHexColor
|
||||
? this.task.getHexColor()
|
||||
: TASK_DEFAULT_COLOR
|
||||
: false
|
||||
|
||||
return color === TASK_DEFAULT_COLOR
|
||||
? ''
|
||||
: color
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
|
|
Loading…
Reference in a new issue