From b1d8ce40bc2523b37dd5d93ef01e9488b45f649c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 28 Feb 2024 15:13:43 +0100
Subject: [PATCH 1/3] fix: refs #6945 css vnRow

---
 src/components/ui/VnRow.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index e13730e62..f2d2b55de 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,16 +1,18 @@
 <template>
-    <div id="row" class="q-gutter-md">
+    <div id="row" class="q-gutter-md q-mb-md">
         <slot></slot>
     </div>
 </template>
 <style lang="scss" scopped>
 #row {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
+    display: flex;
+    > * {
+        flex: 1;
+    }
 }
 @media screen and (max-width: 800px) {
     #row {
-        grid-template-columns: 1fr;
+        flex-direction: column;
     }
 }
 </style>

From 26184328f9aa3065fd665f4145b51da55d26e74f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 28 Feb 2024 15:21:44 +0100
Subject: [PATCH 2/3] fix: refs #6945 entryNotes

---
 src/pages/Entry/Card/EntryNotes.vue | 60 ++++++++++++++---------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 0d2e5e51a..02a0c020a 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -50,25 +50,23 @@ onMounted(() => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <div class="col-3">
-                        <VnSelectFilter
-                            :label="t('entry.notes.observationType')"
-                            v-model="row.observationTypeFk"
-                            :options="entryObservationsOptions"
-                            :disable="!!row.id"
-                            option-label="description"
-                            option-value="id"
-                            hide-selected
-                        />
-                    </div>
-                    <div class="col">
-                        <VnInput
-                            :label="t('globals.description')"
-                            v-model="row.description"
-                            :rules="validate('EntryObservation.description')"
-                        />
-                    </div>
-                    <div class="col-1 row justify-center items-center">
+                    <VnSelectFilter
+                        :label="t('entry.notes.observationType')"
+                        v-model="row.observationTypeFk"
+                        :options="entryObservationsOptions"
+                        :disable="!!row.id"
+                        option-label="description"
+                        option-value="id"
+                        hide-selected
+                    />
+
+                    <VnInput
+                        :label="t('globals.description')"
+                        v-model="row.description"
+                        :rules="validate('EntryObservation.description')"
+                    />
+
+                    <div class="row justify-center items-center">
                         <QIcon
                             name="delete"
                             size="sm"
@@ -82,19 +80,17 @@ onMounted(() => {
                         </QIcon>
                     </div>
                 </VnRow>
-                <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
-                        class="cursor-pointer"
-                        color="primary"
-                        @click="entryObservationsRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('Add note') }}
-                        </QTooltip>
-                    </QIcon>
-                </VnRow>
+                <QIcon
+                    name="add"
+                    size="sm"
+                    class="cursor-pointer"
+                    color="primary"
+                    @click="entryObservationsRef.insert()"
+                >
+                    <QTooltip>
+                        {{ t('Add note') }}
+                    </QTooltip>
+                </QIcon>
             </QCard>
         </template>
     </CrudModel>

From 742b87c78e76042c8ff47be9086938b5c7f8db3c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 29 Feb 2024 10:24:50 +0100
Subject: [PATCH 3/3] refs #6956 deploy: init version 2412

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7beb22e55..4029d7240 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.10.0",
+    "version": "24.12.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",