From 9ff9a4cae9795e434a440843f69dbcef80115bad Mon Sep 17 00:00:00 2001
From: maurofmferrao <maurofmferrao@gmail.com>
Date: Mon, 16 Oct 2023 10:04:50 +0100
Subject: [PATCH] Colour picker fix for short forms relates to
 xibosignage/xibo#3092

---
 modules/templates/global-elements.xml | 6 +++---
 ui/src/style/layout-editor.scss       | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/templates/global-elements.xml b/modules/templates/global-elements.xml
index 8ae071a2c6..39fc316e8b 100644
--- a/modules/templates/global-elements.xml
+++ b/modules/templates/global-elements.xml
@@ -417,7 +417,7 @@ $(target).find('.date').each(function(_idx, dateEl){
             <property id="roundBorder" type="checkbox">
                 <title>Round Border</title>
                 <default>0</default>
-                <helpText>Should the square have rounded corners?</helpText>
+                <helpText>Should the image have rounded corners?</helpText>
                 <visibility>
                     <test>
                         <condition field="objectFit" type="neq">contain</condition>
@@ -656,7 +656,7 @@ $(target).find('.date').each(function(_idx, dateEl){
             <property id="roundBorder" type="checkbox">
                 <title>Round Border</title>
                 <default>0</default>
-                <helpText>Should the square have rounded corners?</helpText>
+                <helpText>Should the rectangle have rounded corners?</helpText>
             </property>
             <property id="borderRadius" type="number">
                 <title>Border Radius</title>
@@ -670,7 +670,7 @@ $(target).find('.date').each(function(_idx, dateEl){
             <property id="outline" type="checkbox">
                 <title>Show Outline</title>
                 <default>1</default>
-                <helpText>Should the square have an outline?</helpText>
+                <helpText>Should the rectangle have an outline?</helpText>
             </property>
             <property id="outlineColor" type="color">
                 <title>Outline Color</title>
diff --git a/ui/src/style/layout-editor.scss b/ui/src/style/layout-editor.scss
index 52891ea8ad..ca8c9595a0 100644
--- a/ui/src/style/layout-editor.scss
+++ b/ui/src/style/layout-editor.scss
@@ -771,6 +771,7 @@ body.editor-opened {
                     overflow: hidden auto;
                     padding: 0 1rem;
                     margin-top: 0.5rem;
+                    flex: 1;
                 }
             }
 
@@ -1957,7 +1958,7 @@ div#bg_media_name {
 
 body[multi-select-active] {
     .moveable-control-box {
-    z-index: 0 !important;
+        z-index: 0 !important;
     }
 
     .layout-live-preview {