diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index 2f191691a7..98334460a7 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -164,7 +164,7 @@ const isEmployee = computed(() => useRole().isEmployee()); class="q-mt-sm q-px-md" :to="`/worker/${user.id}`" color="primary" - :label="t('My account')" + :label="t('globals.myAccount')" dense />
@@ -270,7 +270,3 @@ const isEmployee = computed(() => useRole().isEmployee()); } } - -es: - My account: Mi cuenta - diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue index 5c01d7216f..34cdf88b85 100644 --- a/src/components/ui/VnRow.vue +++ b/src/components/ui/VnRow.vue @@ -9,6 +9,9 @@ > :deep(*) { flex: 1; } + &[wrap] { + flex-wrap: wrap; + } } @media screen and (max-width: 800px) { .vn-row { diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue index 5e24124372..5ded4be001 100644 --- a/src/components/ui/VnSubToolbar.vue +++ b/src/components/ui/VnSubToolbar.vue @@ -43,20 +43,9 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar()); - diff --git a/src/css/app.scss b/src/css/app.scss index 3efe92db41..c233b14f05 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -190,6 +190,10 @@ select:-webkit-autofill { font-size: medium; } +.q-toolbar { + background: var(--vn-section-color); +} + .q-card__actions { justify-content: center; } diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index ee53da80c9..7d36825250 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -266,6 +266,7 @@ globals: title: Unsaved changes will be lost subtitle: Are you sure exit without saving? createInvoiceIn: Create invoice in + myAccount: My account errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index d83e431820..59e5a7d6ea 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -268,7 +268,7 @@ globals: title: Los cambios que no haya guardado se perderán subtitle: ¿Seguro que quiere salir sin guardar? createInvoiceIn: Crear factura recibida - + myAccount: Mi cuenta errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 528cdf2346..822f6bb338 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -1,5 +1,5 @@ + +es: + Create training course: Crear curso de formación + diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue index 0853791ef8..7652413416 100644 --- a/src/pages/Worker/WorkerFilter.vue +++ b/src/pages/Worker/WorkerFilter.vue @@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n'; import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnInput from 'src/components/common/VnInput.vue'; +import VnSelect from 'src/components/common/VnSelect.vue'; const { t } = useI18n(); const props = defineProps({ @@ -26,7 +27,7 @@ const departments = ref(); {{ formatFn(tag.value) }}
-