diff --git a/quasar.config.js b/quasar.config.js index 755e96bd3..2d8289508 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -67,7 +67,7 @@ module.exports = configure(function (/* ctx */) { // analyze: true, // env: {}, rawDefine: { - 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV) + 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), }, // ignorePublicFolder: true, // minify: false, @@ -92,7 +92,7 @@ module.exports = configure(function (/* ctx */) { vitePlugins: [ [ VueI18nPlugin({ - runtimeOnly: false + runtimeOnly: false, }), { // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false` @@ -123,9 +123,6 @@ module.exports = configure(function (/* ctx */) { framework: { config: { config: { - brand: { - primary: 'orange', - }, dark: 'auto', }, }, diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 241a813b8..c53193e6f 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -171,6 +171,7 @@ const emit = defineEmits(['onFetch']); diff --git a/src/css/app.scss b/src/css/app.scss index 4fec9db08..c0c523a9f 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,17 +1,58 @@ // app global css in SCSS form @import './icons.scss'; +body.body--light { + --fount-color: black; + --vn-sectionColor: #ffffff; + --vn-pageColor: #e0e0e0; + background-color: var(--vn-pageColor); + .q-header .q-toolbar { + color: var(--fount-color); + } + --vn-text: var(--fount-color); + --vn-gray: var(--vn-sectionColor); + --vn-label: #5f5f5f; + --vn-dark: var(--vn-sectionColor); + --vn-light-gray: #e7e3e3; +} + +body.body--dark { + --vn-pageColor: #222; + --vn-SectionColor: #3c3b3b; + 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; +} + a { text-decoration: none; } .link { - color: $primary; + color: $color-link; cursor: pointer; } +.tx-color-link { + color: $color-link !important; +} + +.header-link { + color: $color-link !important; + cursor: pointer; + border-bottom: solid $primary; + border-width: 2px; + width: 100%; + .q-icon { + float: right; + } +} + .link:hover { - color: $orange-4; + text-decoration: underline; } // Removes chrome autofill background @@ -24,26 +65,6 @@ select:-webkit-autofill { background-clip: text !important; } -body.body--light { - .q-header .q-toolbar { - background-color: $white; - color: #555; - } - --vn-text: #000000; - --vn-gray: #f5f5f5; - --vn-label: #5f5f5f; - --vn-dark: white; - --vn-light-gray: #e7e3e3; -} - -body.body--dark { - --vn-text: #ffffff; - --vn-gray: #313131; - --vn-label: #a8a8a8; - --vn-dark: #292929; - --vn-light-gray: #424242; -} - .bg-vn-dark { background-color: var(--vn-dark); } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 58b202522..4ad358d6f 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -11,26 +11,32 @@ // It's highly recommended to change the default colors // to match your app's branding. // Tip: Use the "Theme Builder" on Quasar's documentation website. - +// Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors $primary: #ec8916; -$primary-light: lighten($primary, 35%); -$secondary: #26a69a; -$accent: #9c27b0; -$white: #fff; - +$secondary: $primary; $positive: #21ba45; $negative: #c10015; $info: #31ccec; $warning: #f2c037; -$vnColor: #8ebb27; - // Pendiente de cuadrar con la base de datos $success: $positive; $alert: $negative; +$white: #fff; +$dark: #3c3b3b; +// custom +$color-link: #66bfff; +$color-spacer-light: #a3a3a31f; +$color-spacer: #7979794d; +$border-thin-light: 1px solid $color-spacer-light; + +$dark-shadow-color: black; +$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d; +$spacing-md: 16px; .bg-success { background-color: $positive; } + .bg-notice { background-color: $info; } @@ -40,12 +46,3 @@ $alert: $negative; .bg-alert { background-color: $negative; } - -$color-spacer-light: rgba(255, 255, 255, 0.12); -$color-spacer: rgba(255, 255, 255, 0.3); -$border-thin-light: 1px solid $color-spacer-light; - -$dark-shadow-color: #000; -$dark: #292929; -$layout-shadow-dark: 0 0 10px 2px rgba(0, 0, 0, 0.2), 0 0px 10px rgba(0, 0, 0, 0.24); -$spacing-md: 16px; diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue index 8e9ab3e41..f66fcff1f 100644 --- a/src/layouts/OutLayout.vue +++ b/src/layouts/OutLayout.vue @@ -40,7 +40,7 @@ const langs = ['en', 'es']; - + - + {{ t('claim.pageTitles.basicData') }} - + - + {{ t('claim.summary.notes') }} - + - + {{ t('claim.summary.details') }} - + @@ -268,9 +268,9 @@ function openDialog(dmsId) { - + {{ t('claim.summary.development') }} - + @@ -283,9 +283,9 @@ function openDialog(dmsId) { - + {{ t('claim.summary.photos') }} - + - Video + Videoheader - + {{ t('claim.summary.actions') }} - + - + {{ t('customer.summary.basicData') }} - + @@ -96,9 +96,12 @@ const creditWarning = computed(() => { /> - + {{ t('customer.summary.fiscalAddress') }} - + { - + {{ t('customer.summary.fiscalData') }} - + { /> - + {{ t('customer.summary.billingData') }} - + { /> - + {{ t('customer.summary.consignee') }} - + { /> - + {{ t('customer.summary.webAccess') }} - + { /> - + {{ t('customer.summary.businessData') }} { {{ t('customer.summary.financialData') }} - + { {{ t('Basic data') }} - + diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index e3d7e4431..b6863f8f7 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -164,15 +164,20 @@ const fetchEntryBuys = async () => { :url="`Entries/${entityId}/getEntry`" @on-fetch="(data) => setEntryData(data)" > + + + + + {{ entry.id }} - {{ entry.supplier.nickname }} - + {{ t('globals.summary.basicData') }} - + @@ -214,8 +219,9 @@ const fetchEntryBuys = async () => { /> - + {{ t('Travel data') }} + @@ -264,8 +270,9 @@ const fetchEntryBuys = async () => { /> - + {{ t('entry.summary.buys') }} + - + {{ t('invoiceIn.pageTitles.basicData') }} - + - + {{ t('invoiceIn.pageTitles.basicData') }} - + - + {{ t('invoiceIn.pageTitles.basicData') }} - + - + {{ t('invoiceIn.pageTitles.basicData') }} - + @@ -319,9 +319,9 @@ function getLink(param) { - + {{ t('invoiceIn.card.vat') }} - + - + {{ t('invoiceIn.card.dueDay') }} - + - + {{ t('invoiceIn.card.intrastat') }} - + - + {{ t('invoiceOut.pageTitles.basicData') }} - + + - + {{ t('invoiceOut.summary.taxBreakdown') }} - + + @@ -140,9 +142,10 @@ const ticketsColumns = ref([ - + {{ t('invoiceOut.summary.tickets') }} - + + diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue index e2ccdac16..9c469e611 100644 --- a/src/pages/Login/LoginMain.vue +++ b/src/pages/Login/LoginMain.vue @@ -69,12 +69,12 @@ async function onSubmit() { - - - + @@ -104,6 +104,9 @@ async function onSubmit() { min-width: 300px; } +.q-input { + color: $primary; +} @media (max-width: $breakpoint-xs-max) { .formCard { min-width: 100%; diff --git a/src/pages/Login/VerifyEmail.vue b/src/pages/Login/VerifyEmail.vue index dae20e8b6..4c02e5869 100644 --- a/src/pages/Login/VerifyEmail.vue +++ b/src/pages/Login/VerifyEmail.vue @@ -99,6 +99,8 @@ onMounted(async () => {