From 0c3dc30b8c329273fdcc79969cea991ec9c22e06 Mon Sep 17 00:00:00 2001 From: pablone Date: Tue, 12 Mar 2024 09:49:58 +0100 Subject: [PATCH 1/7] fix(styles): refs #7001 create VnTitle and correct background-page color --- src/components/common/VnTitle.vue | 25 +++++++++++ src/css/app.scss | 2 +- src/pages/Claim/Card/ClaimSummary.vue | 10 +++-- src/pages/Entry/Card/EntrySummary.vue | 63 +-------------------------- 4 files changed, 34 insertions(+), 66 deletions(-) create mode 100644 src/components/common/VnTitle.vue diff --git a/src/components/common/VnTitle.vue b/src/components/common/VnTitle.vue new file mode 100644 index 000000000..1d53e47a1 --- /dev/null +++ b/src/components/common/VnTitle.vue @@ -0,0 +1,25 @@ + + + diff --git a/src/css/app.scss b/src/css/app.scss index 38dd642a3..459a7f2dc 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -18,7 +18,7 @@ body.body--light { body.body--dark { --vn-pageColor: #222; - --vn-SectionColor: #3c3b3b; + --vn-SectionColor: #403c3c; background-color: var(--vn-pageColor); --vn-text: white; --vn-gray: var(--vn-SectionColor); diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index bf6b57973..2d8592b6d 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -11,6 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue'; import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; +import VnTitle from 'src/components/common/VnTitle.vue'; const route = useRoute(); const { t } = useI18n(); @@ -179,10 +180,11 @@ function openDialog(dmsId) { diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue index ceb24b2bb..d45eef103 100644 --- a/src/components/ui/VnSms.vue +++ b/src/components/ui/VnSms.vue @@ -4,6 +4,7 @@ import { date } from 'quasar'; import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnAvatar from '../ui/VnAvatar.vue'; import VnUserLink from 'src/components/ui/VnUserLink.vue'; +import VnChip from '../common/VnChip.vue'; const $props = defineProps({ url: { type: String, default: null }, @@ -89,15 +90,14 @@ function formatNumber(number) { ) }} - - {{ row.sms.status }} - + :text="row.sms.status" + /> diff --git a/src/css/app.scss b/src/css/app.scss index 459a7f2dc..7d8a29920 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -2,29 +2,24 @@ @import './icons.scss'; body.body--light { - --fount-color: black; - --vn-sectionColor: #ffffff; - --vn-pageColor: #e0e0e0; - background-color: var(--vn-pageColor); + --font-color: black; + --vn-section-color: #e0e0e0; + --vn-page-color: #ffffff; + background-color: #ffffff; .q-header .q-toolbar { - color: var(--fount-color); + color: var(--font-color); } - --vn-text: var(--fount-color); - --vn-gray: var(--vn-sectionColor); - --vn-label: #5f5f5f; - --vn-dark: var(--vn-sectionColor); - --vn-light-gray: #e7e3e3; + --vn-text-color: var(--font-color); + --vn-label-color: #5f5f5f; + --vn-accent-color: #e7e3e3; } body.body--dark { - --vn-pageColor: #222; - --vn-SectionColor: #403c3c; - background-color: var(--vn-pageColor); - --vn-text: white; - --vn-gray: var(--vn-SectionColor); - --vn-label: #a8a8a8; - --vn-dark: var(--vn-SectionColor); - --vn-light-gray: #424242; + --vn-section-color: #403c3c; + background-color: #222; + --vn-text-color: white; + --vn-label-color: #a8a8a8; + --vn-accent-color: #424242; } a { @@ -59,19 +54,23 @@ a { // Removes chrome autofill background input:-webkit-autofill, select:-webkit-autofill { - color: var(--vn-text); + color: var(--vn-text-color); font-family: $typography-font-family; - -webkit-text-fill-color: var(--vn-text); + -webkit-text-fill-color: var(--vn-text-color); -webkit-background-clip: text !important; background-clip: text !important; } .bg-vn-dark { - background-color: var(--vn-dark); + background-color: var(--vn-section-color); +} + +.bg-vn-dark { + background-color: var(--vn-section-color); } .color-vn-text { - color: var(--vn-text); + color: var(--vn-text-color); } .color-vn-white { @@ -79,8 +78,8 @@ select:-webkit-autofill { } .vn-card { - background-color: var(--vn-gray); - color: var(--vn-text); + background-color: var(--vn-section-color); + color: var(--vn-text-color); border-radius: 8px; } @@ -90,11 +89,11 @@ select:-webkit-autofill { } .bg-vn-primary-row { - background-color: var(--vn-dark); + background-color: var(--vn-section-color); } .bg-vn-secondary-row { - background-color: var(--vn-light-gray); + background-color: var(--vn-accent-color); } /* Estilo para el asterisco en campos requeridos */ diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index b70e3e8d0..8423a9a35 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -14,10 +14,10 @@ // Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors $primary: #ec8916; $secondary: $primary; -$positive: #21ba45; -$negative: #c10015; -$info: #31ccec; -$warning: #f2c037; +$positive: #c8e484; +$negative: #fb5252; +$info: #84d0e2; +$warning: #f4b974; // Pendiente de cuadrar con la base de datos $success: $positive; $alert: $negative; diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index b5b9aae99..968f1e294 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -107,7 +107,11 @@ onMounted(async () => {