verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 62 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jorge Penadés 2024-05-27 08:57:34 +02:00
parent 66c6c857db cedc3e5c83
commit 3b799efa22
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ui/FetchedTags.vue
View File

@ -61,7 +61,7 @@ const tags = computed(() => {
.inline-tag { .inline-tag {
height: 1rem; height: 1rem;
margin: 0.05rem; margin: 0.05rem;
color: $secondary; color: $color-font-secondary;
text-align: center; text-align: center;
font-size: smaller; font-size: smaller;
padding: 1px; padding: 1px;

2
src/components/ui/QCalendarMonthWrapper.vue
View File

@ -147,7 +147,7 @@ const containerClasses = computed(() => {
.q-calendar-month__head--workweek, .q-calendar-month__head--workweek,
.q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis { .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
text-transform: capitalize; text-transform: capitalize;
color: #777; color: var(---color-font-secondary);
font-weight: bold; font-weight: bold;
font-size: 0.8rem; font-size: 0.8rem;
text-align: center; text-align: center;

2
src/css/quasar.variables.scss
View File

@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
$dark-shadow-color: black; $dark-shadow-color: black;
$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d; $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
$spacing-md: 16px; $spacing-md: 16px;
$color-font-secondary: #777;
.bg-success { .bg-success {
background-color: $positive; background-color: $positive;
} }

2
src/i18n/locale/en.yml
View File

@ -867,7 +867,7 @@ worker:
sex: Sexo sex: Sexo
seniority: Antigüedad seniority: Antigüedad
fi: DNI/NIE/NIF fi: DNI/NIE/NIF
birth: Cumpleaños birth: Fecha de nacimiento
isFreelance: Autónomo isFreelance: Autónomo
isSsDiscounted: Bonificación SS isSsDiscounted: Bonificación SS
hasMachineryAuthorized: Autorizado para llevar maquinaria hasMachineryAuthorized: Autorizado para llevar maquinaria

2
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -201,6 +201,6 @@ es:
isDisable: Trabajador desactivado isDisable: Trabajador desactivado
fi: DNI/NIE/NIF fi: DNI/NIE/NIF
sex: Sexo sex: Sexo
birth: Cumpleaños birth: Fecha de Nacimiento
isSsDiscounted: Bonificación SS isSsDiscounted: Bonificación SS
</i18n> </i18n>

4
src/pages/Worker/Card/WorkerSummary.vue
View File

@ -73,7 +73,7 @@ const filter = {
<template #body="{ entity: worker }"> <template #body="{ entity: worker }">
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle <VnTitle
:url="workerUrl + `basic-data`" :url="`#/worker/${entityId}/basic-data`"
:text="t('worker.summary.basicData')" :text="t('worker.summary.basicData')"
/> />
<VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" /> <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
@ -113,7 +113,7 @@ const filter = {
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle <VnTitle
:url="workerUrl + `basic-data`" :url="`#/worker/${entityId}/basic-data`"
:text="t('worker.summary.basicData')" :text="t('worker.summary.basicData')"
/> />
<VnLv <VnLv