From ace55c554f5ba51bfc269df81985a4171315f0f7 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 18 Apr 2024 08:03:57 +0200 Subject: [PATCH 1/5] refactor: refs #6899 corrected Lilium styles and functionalities --- src/css/app.scss | 9 +++++++++ .../InvoiceOut/Card/InvoiceOutSummary.vue | 20 +++++++++++++++++-- .../InvoiceOut/InvoiceOutNegativeBases.vue | 5 ++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index b36036df4..aaa071cde 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -127,6 +127,15 @@ select:-webkit-autofill { background-color: var(--vn-section-color); } +.q-checkbox { + & .q-checkbox__label { + color: var(--vn-text-color); + } + & .q-checkbox__inner { + color: var(--vn-label-color); + } +} + .q-chip, .q-notification__message, .q-notification__icon { diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index a6a28bdde..688bbf2aa 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -138,7 +138,7 @@ const ticketsColumns = ref([ + + \ No newline at end of file diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue index fb434124c..e0b17a4b3 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -183,7 +183,7 @@ const downloadCSV = async () => { @@ -211,6 +211,9 @@ const downloadCSV = async () => { border-radius: 4px; padding: 6px; } +.no-uppercase{ + text-transform: none; +} From 3f8cafd2015dd4fa10ad709bf6019bbc98c917e9 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 18 Apr 2024 13:14:59 +0200 Subject: [PATCH 2/5] style: refs #6899 fixed style --- src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 688bbf2aa..2d6d17ae2 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -151,7 +151,12 @@ const ticketsColumns = ref([ \ No newline at end of file + From 6021e1e4ce68aa7c13fc6a93b8ef4dfbf13f6c73 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 19 Apr 2024 07:37:33 +0200 Subject: [PATCH 3/5] refactor: refs #6899 changed comercial value in negativeBases table --- src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue index e0b17a4b3..36180a2e7 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -183,7 +183,9 @@ const downloadCSV = async () => { @@ -211,7 +213,7 @@ const downloadCSV = async () => { border-radius: 4px; padding: 6px; } -.no-uppercase{ +.no-uppercase { text-transform: none; } From ab61a68f28466bb1be2a91d908a2660fc9cc6ea4 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 22 Apr 2024 11:20:25 +0200 Subject: [PATCH 4/5] refactor: refs #6899 moved css to app.scss --- src/css/app.scss | 9 ++++++++- src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 11 +---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index aaa071cde..f596a18dd 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -136,6 +136,13 @@ select:-webkit-autofill { } } +.q-btn { + text-transform: none; +} +.tr-header { + color: var(--vn-label-color); +} + .q-chip, .q-notification__message, .q-notification__icon { @@ -168,4 +175,4 @@ input::-webkit-inner-spin-button { appearance: none; -webkit-appearance: none; -moz-appearance: none; -} \ No newline at end of file +} diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 2d6d17ae2..4c6e1dc56 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -171,7 +171,7 @@ const ticketsColumns = ref([ - - From 39685c222f5e83354568b005b16d813c512a5dfb Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 24 Apr 2024 09:14:35 +0200 Subject: [PATCH 5/5] refactor: refs #6899 fixed css and minor changes --- src/css/app.scss | 3 --- src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 7 ++++++- src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/css/app.scss b/src/css/app.scss index 4bc4ded9a..9edf19d06 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -145,9 +145,6 @@ select:-webkit-autofill { } } -.q-btn { - text-transform: none; -} .tr-header { color: var(--vn-label-color); } diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue index 4c6e1dc56..e98de6b30 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -171,7 +171,7 @@ const ticketsColumns = ref([ + diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue index 36180a2e7..182de2c83 100644 --- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue +++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue @@ -119,8 +119,8 @@ const columns = computed(() => [ }, { label: t('invoiceOut.negativeBases.comercial'), - field: 'workerSocialName', - name: 'comercial', + field: 'workerName', + name: 'worker', align: 'left', }, ]); @@ -181,10 +181,10 @@ const downloadCSV = async () => { -