From 148224344d23e314024625120d9ff5f999f38268 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 2 Apr 2024 10:46:27 +0200
Subject: [PATCH 1/3] feat(style): refs #7128 add style

---
 src/components/FormModel.vue         |  3 ++
 src/components/ui/CardDescriptor.vue | 19 +++++++------
 src/components/ui/CardSummary.vue    |  4 +--
 src/components/ui/VnSubToolbar.vue   |  7 ++++-
 src/css/app.scss                     | 41 +++++++++++++++++++++-------
 src/css/quasar.variables.scss        |  2 +-
 src/pages/Login/LoginMain.vue        |  2 +-
 7 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 6fa17dfc9..060a18bcc 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -284,6 +284,9 @@ defineExpose({
     />
 </template>
 <style lang="scss" scoped>
+.q-notifications {
+    color: black;
+}
 #formModel {
     max-width: 800px;
     width: 100%;
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 85e0a7857..1cc744c81 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -158,7 +158,7 @@ const emit = defineEmits(['onFetch']);
             <div class="icons">
                 <slot name="icons" :entity="entity" />
             </div>
-            <div class="actions">
+            <div class="actions justify-center">
                 <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
@@ -177,22 +177,23 @@ const emit = defineEmits(['onFetch']);
 .body {
     background-color: var(--vn-section-color);
     .text-h5 {
+        font-size: 20px;
         padding-top: 5px;
-        padding-bottom: 5px;
+        padding-bottom: 0px;
     }
     .q-item {
         min-height: 20px;
 
         .link {
-            margin-left: 5px;
+            margin-left: 10px;
         }
     }
     .vn-label-value {
         display: flex;
-        padding: 2px 16px;
+        padding: 0px 16px;
         .label {
             color: var(--vn-label-color);
-            font-size: 12px;
+            font-size: 14px;
 
             &:not(:has(a))::after {
                 content: ':';
@@ -201,7 +202,7 @@ const emit = defineEmits(['onFetch']);
         .value {
             color: var(--vn-text-color);
             font-size: 14px;
-            margin-left: 12px;
+            margin-left: 4px;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
@@ -219,18 +220,19 @@ const emit = defineEmits(['onFetch']);
     overflow: hidden;
     text-overflow: ellipsis;
     span {
-        color: $primary;
+        color: var(--vn-text-color);
         font-weight: bold;
     }
 }
 .subtitle {
     color: var(--vn-text-color);
     font-size: 16px;
-    margin-bottom: 15px;
+    margin-bottom: 2px;
 }
 .list-box {
     .q-item__label {
         color: var(--vn-label-color);
+        padding-bottom: 0%;
     }
 }
 .descriptor {
@@ -248,6 +250,7 @@ const emit = defineEmits(['onFetch']);
     }
     .actions {
         margin: 0 5px;
+        justify-content: center !important;
     }
 }
 </style>
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index f5f61155c..3c70cd22b 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -70,7 +70,7 @@ watch(props, async () => {
                         </router-link>
                         <span v-else></span>
                     </slot>
-                    <slot name="header" :entity="entity">
+                    <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
                     <slot name="header-right">
@@ -93,7 +93,6 @@ watch(props, async () => {
 
 .cardSummary {
     width: 100%;
-
     .summaryHeader {
         text-align: center;
         font-size: 20px;
@@ -128,6 +127,7 @@ watch(props, async () => {
             padding: 7px;
             font-size: 16px;
             min-width: 275px;
+            box-shadow: none;
 
             .vn-label-value {
                 display: flex;
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 018447057..22eebdf36 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -14,7 +14,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="justify-end sticky">
+    <QToolbar class="bg-vn-section-color justify-end sticky">
         <slot name="st-data">
             <div id="st-data"></div>
         </slot>
@@ -24,6 +24,11 @@ onUnmounted(() => {
         </slot>
     </QToolbar>
 </template>
+<style lang="scss">
+.q-toolbar {
+    background: var(--vn-section-color);
+}
+</style>
 <style lang="scss" scoped>
 .sticky {
     position: sticky;
diff --git a/src/css/app.scss b/src/css/app.scss
index 3baa60c9b..d543e3f82 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -14,21 +14,15 @@ body.body--light {
     .q-header .q-toolbar {
         color: var(--font-color);
     }
-    .q-card,
-    .q-table,
-    .q-table__bottom,
-    .q-drawer {
-        background-color: var(--vn-section-color);
-    }
 }
-
 body.body--dark {
-    --vn-section-color: #403c3c;
+    --vn-page-color: #222;
+    --vn-section-color: #3d3d3d;
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
 
-    background-color: #222;
+    background-color: var(--vn-page-color);
 }
 
 a {
@@ -118,9 +112,36 @@ select:-webkit-autofill {
     content: ' *';
 }
 
-.q-chip {
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
+.q-chip,
+.q-notification__message,
+.q-notification__icon {
     color: black;
 }
+.q-notification--standard.bg-negative {
+    background-color: #fa3939 !important;
+}
+.q-notification--standard.bg-positive {
+    background-color: #a3d131 !important;
+}
+
+.q-tooltip {
+    background-color: var(--vn-page-color);
+    color: var(--font-color);
+    font-size: medium;
+}
+
+.q-card__actions {
+    justify-content: center;
+}
+
+/* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
 input[type='number'] {
     -moz-appearance: textfield;
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 8423a9a35..81e8220ea 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -22,7 +22,7 @@ $warning: #f4b974;
 $success: $positive;
 $alert: $negative;
 $white: #fff;
-$dark: #3c3b3b;
+$dark: #403c3c;
 // custom
 $color-link: #66bfff;
 $color-spacer-light: #a3a3a31f;
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index f920854c6..fcde51edf 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -55,7 +55,7 @@ async function onSubmit() {
         if (res.response?.data?.error?.code === 'REQUIRES_2FA') {
             Notify.create({
                 message: t('login.twoFactorRequired'),
-                icon: 'phonelink_lock',
+                icon: 'phoneLink_lock',
                 type: 'warning',
             });
             params.keepLogin = keepLogin.value;

From c66be3c2b58af8ddbc78297153612c3a0249507f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 2 Apr 2024 14:04:09 +0200
Subject: [PATCH 2/3] feat #7128 fix styles

---
 src/components/LeftMenuItem.vue | 2 +-
 src/css/app.scss                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 976136394..627c272e2 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
+    <QItem active-class="bg-hover" :to="{ name: item.name }" clickable v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>
diff --git a/src/css/app.scss b/src/css/app.scss
index d543e3f82..42af53aa4 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -70,6 +70,9 @@ select:-webkit-autofill {
 .bg-vn-section-color {
     background-color: var(--vn-section-color);
 }
+.bg-hover {
+    background-color: #666666;
+}
 
 .color-vn-text {
     color: var(--vn-text-color);

From c0ed8da0b735e481c92bdec99d9800e8e0f0b44f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Apr 2024 15:02:31 +0200
Subject: [PATCH 3/3] remove space

---
 src/pages/Route/RouteRoadmap.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index b1d5d4159..4053b57c7 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -277,7 +277,6 @@ function navigateToRoadmapSummary(event, row) {
 .route-list {
     width: 100%;
 }
-
 .table-actions {
     gap: 12px;
 }