Display: clean styles for checkbox and fix radios #7378

Author: AngelFQC

assets/css/scss/atoms/_checkbox.scss

@@ -94,27 +94,3 @@
 .p-checkbox-input:checked + .p-checkbox-box .p-checkbox-icon {
   @apply block;
 }
-.p-checkbox.p-component {
-  @apply relative inline-flex items-center mr-2;
-}
-.p-checkbox.p-component input[type="checkbox"] {
-  @apply absolute top-0 left-0 w-5 h-5 m-0 opacity-0 cursor-pointer;
-  z-index: 2;
-}
-.p-checkbox-box {
-  @apply w-5 h-5 flex items-center justify-center border border-gray-30 rounded;
-  z-index: 1;
-}
-.p-checkbox.p-component + label,
-.p-checkbox.p-component ~ label {
-  @apply ml-2;
-}
-.p-checkbox-box .p-checkbox-icon {
-  @apply hidden;
-}
-.p-checkbox.p-component input[type="checkbox"]:checked + .p-checkbox-box {
-  @apply bg-primary border-primary;
-}
-.p-checkbox.p-component input[type="checkbox"]:checked + .p-checkbox-box .p-checkbox-icon {
-  @apply block text-white;
-}

public/main/inc/lib/pear/HTML/QuickForm/checkbox.php

@@ -120,7 +120,7 @@ public function getChecked()
      */
     public function toHtml()
     {
-        $extraClass = "p-checkbox-input p-checkbox-input--legacy";
+        $extraClass = "p-checkbox-input";
 
         if (isset($this->_attributes['class'])) {
             $this->_attributes['class'] .= $extraClass;
@@ -141,12 +141,12 @@ public function toHtml()
             $id = $this->getAttribute('id');
 
             // Ensure checkbox input has the expected class for styling.
-            $existingClass = (string) $this->getAttribute('class');
+            /*$existingClass = (string) $this->getAttribute('class');
             if (!str_contains($existingClass, 'p-checkbox-input')) {
                 $this->setAttribute('class', trim($existingClass.' p-checkbox-input'));
-            }
+            } */
 
-            return '<div id="'.$name.'" class="'.$checkClass.'">
+            return '<div id="'.$name.'" class="field '.$checkClass.'">
                 <div class="p-checkbox p-component '.($this->getChecked() ? 'p-checkbox-checked' : '').'">
                     '.parent::toHtml().'
                     <div class="p-checkbox-box">

public/main/inc/lib/pear/HTML/QuickForm/radio.php

@@ -111,7 +111,7 @@ public function getTemplate(string $layout): string
      */
     public function toHtml()
     {
-        $extraClass = "p-radiobutton-input p-radiobutton-input--legacy";
+        $extraClass = "p-radiobutton-input";
 
         if (isset($this->_attributes['class'])) {
             $this->_attributes['class'] .= $extraClass;
@@ -121,7 +121,9 @@ public function toHtml()
 
         if (0 == strlen($this->_text)) {
             $label = '';
-        } elseif ($this->isFrozen()) {
+        }
+
+        if ($this->isFrozen()) {
             $label = $this->_text;
             if ($this->freezeSeeOnlySelected) {
                 $invisible = $this->getChecked() ? '' : ' style="display:none"';