Issue #1132: Solved label problems related to Issue #625

RotherOSS · Sep 20, 2021 · fafd0ae · fafd0ae
1 parent 6cf773f
commit fafd0ae
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/var/httpd/htdocs/js/Core.UI.InputFields.js b/var/httpd/htdocs/js/Core.UI.InputFields.js
@@ -278,13 +278,19 @@ Core.UI.InputFields = (function (TargetNS) {
         if ( Config.CustomerInterface ) {
 
             // for the customer interface
-            $('fieldset > .Row').each( function() {
+            $('fieldset > .Row, .RichTextHolder').each( function() {
                 var Label = $(this).children('label').first();
                 var Checkbox = $('.Field > input[type=checkbox]', this);
                 var Select = $('.Field > select', this);
                 var Textarea = $('.Field > textarea', this);
                 var TextInput = $('input[type="text"]', this);
 
+                if(Textarea.length === 0) {
+                    Textarea = $('textarea', this);
+                }
+
+                console.log(Textarea);
+
                 // move labels for checkboxes
                 if ( Checkbox.length > 0 && Select.length === 0 ) {
                     $('.Field', this).addClass('oooCheckboxContainer');

diff --git a/var/httpd/htdocs/skins/Customer/default/css/Core.InputFields.css b/var/httpd/htdocs/skins/Customer/default/css/Core.InputFields.css
@@ -210,6 +210,8 @@ textarea.oooFull,
 }
 
 .Row > input:hover ~ label,
+.RichTextHolder > textarea:hover ~label,
+textarea.oooFull ~ label,
 input.oooFull ~ label,
 .Field:hover ~ label,
 .Field.oooFull ~ label,
@@ -225,6 +227,16 @@ input.oooFull ~ label,
     background-color:#ffffff;
 }
 
+.RichTextHolder > textarea:hover ~ label {
+    top: -29px;
+    font-size: 10px;
+    line-height: 1.3;
+    letter-spacing: 0.5px;
+    color: #7f809d;
+    color: var(--colTextLight);
+    background-color: #ffffff;
+}
+
 /* focus */
 input:focus,
 input[aria-expanded="true"],