From 65626446fd3b3ecf4969149609a1e2486bed7f94 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 9 Apr 2024 13:01:29 +0200 Subject: [PATCH 1/4] refactor: refs #7186 fixed style and tab --- src/pages/InvoiceIn/Card/InvoiceInVat.vue | 38 ++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue index 3eb9365d2..fa0ad12db 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue @@ -32,6 +32,13 @@ const invoiceInFormRef = ref(); const expensesRef = ref(); const newExpenseRef = ref(); +const $props = defineProps({ + actionIcon: { + type: String, + default: 'add', + }, +}); + const columns = computed(() => [ { name: 'expense', @@ -94,6 +101,11 @@ const columns = computed(() => [ field: (row) => row.foreignValue, align: 'left', }, + { + get() { + return $props.actionIcon; + }, + } ]); const filter = { @@ -207,17 +219,19 @@ async function addExpense() { @click.stop="value = null" class="cursor-pointer" /> - {{ t('Create expense') }} - + @@ -470,6 +484,16 @@ async function addExpense() { .q-item { min-height: 0; } +.default-icon { + cursor: pointer; + color: $primary; + border-radius: 50px; + + &.--add-icon { + color: var(--vn-text-color); + background-color: $primary; + } +} es: From 15d4b54ddaaa343b28c7fe124ad709fff8e5c729 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 9 Apr 2024 13:34:45 +0200 Subject: [PATCH 2/4] refactor: refs #7186 fixed changes --- src/pages/InvoiceIn/Card/InvoiceInVat.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue index fa0ad12db..02ec0fd38 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue @@ -32,7 +32,7 @@ const invoiceInFormRef = ref(); const expensesRef = ref(); const newExpenseRef = ref(); -const $props = defineProps({ +defineProps({ actionIcon: { type: String, default: 'add', @@ -101,11 +101,6 @@ const columns = computed(() => [ field: (row) => row.foreignValue, align: 'left', }, - { - get() { - return $props.actionIcon; - }, - } ]); const filter = { From f9de26933a7d782ec048bbd6c414c8f4644b4dfe Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 10 Apr 2024 08:00:36 +0200 Subject: [PATCH 3/4] refactor: refs #7186 fill-icon change --- src/pages/InvoiceIn/Card/InvoiceInVat.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue index 02ec0fd38..b170cc4b5 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue @@ -219,9 +219,7 @@ async function addExpense() { :name="actionIcon" :size="actionIcon === 'add' ? 'xs' : 'sm'" :class="['default-icon', { '--add-icon': actionIcon === 'add' }]" - :style="{ - 'font-variation-settings': `'FILL' ${1}`, - }" + :style="fill-icon" > {{ t('Create expense') }} From 09ceefb7c5a0fe8a09e35ef6ef30a8529206a40c Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 10 Apr 2024 08:49:54 +0200 Subject: [PATCH 4/4] style: refs #7186 fixed style --- src/pages/InvoiceIn/Card/InvoiceInVat.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue index b170cc4b5..5d3e82824 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue @@ -217,9 +217,8 @@ async function addExpense() { {{ t('Create expense') }} @@ -479,13 +478,8 @@ async function addExpense() { } .default-icon { cursor: pointer; - color: $primary; border-radius: 50px; - - &.--add-icon { - color: var(--vn-text-color); - background-color: $primary; - } + background-color: $primary; }