diff --git a/assets/core/core.register.js b/assets/core/core.register.js index 4ef2776..5d0f7a9 100644 --- a/assets/core/core.register.js +++ b/assets/core/core.register.js @@ -72,7 +72,7 @@ __PluginManager__.registerPlugins({ onInstall: function(plugin){ var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) { - return new __pmGlobal__.Tooltip(tooltipTriggerEl, {sanitize: false}); + return __pmGlobal__.Tooltip.getOrCreateInstance(tooltipTriggerEl, {sanitize: false}); }); }, deps: ['popper', 'bsCore'], diff --git a/assets/toolkit/toolkit.css b/assets/toolkit/toolkit.css index 5c2587c..2925e20 100644 --- a/assets/toolkit/toolkit.css +++ b/assets/toolkit/toolkit.css @@ -5,7 +5,7 @@ .kit-field { display: flex; flex-direction: row; - flex-wrap: nowrap; + flex-wrap: wrap; margin: 10px 0; position: relative; pointer-events: none; @@ -587,7 +587,7 @@ border-color: #e1e1e1; } .kit-field input[type='checkbox'].kit-field--error:checked ~.kit-field__label .kit-field__icon { - background: var(--kit-color-error); + background: transparent; border-color: var(--kit-color-error); } .kit-field input[type='checkbox'].kit-field--error ~.kit-field__label .kit-field__icon @@ -595,7 +595,7 @@ border-color: var(--kit-color-error); } .kit-field input[type='checkbox']:disabled ~.kit-field__label { - color: #e1e1e1 !important; + color: #858585 !important; cursor: default; } .kit-field input[type='checkbox']:disabled ~.kit-field__label .kit-field__icon { @@ -947,6 +947,20 @@ select.kit-field__input { /* Track */ /* Handle */ } +.kit-field__description:empty { + display: none; +} +.kit-field__description { + order: 1200; + flex: 1 0 100%; + font-size: 0.8em; + line-height: 1.25em; + opacity: 0.8; + padding: 0 0 0.5em; +} +.kit-field input[type="checkbox"] ~ .kit-field__description { + padding-left: calc(1.75em / 0.8); +} .kit-field select.kit-field__input:empty ~ .kit-field__arrow { display: none; } diff --git a/templates/input.php b/templates/input.php index 17e6953..ba4173a 100644 --- a/templates/input.php +++ b/templates/input.php @@ -10,6 +10,7 @@ use Wt\Core\Tools; $arParams['TYPE'] = $arParams['TYPE']?:'hidden'; $isReadonly = Tools::isTrue($arParams['READONLY']); +$isDisabled = Tools::isTrue($arParams['DISABLED']); $isRequired = Tools::isTrue($arParams['REQUIRED']); $isChecked = Tools::isTrue($arParams['CHECKED']); $isHint = (string)($arParams['HINT']) !== ''; @@ -34,6 +35,7 @@ if($isHint) { if($isReadonly){?> readonly} if($isRequired){?> required} if($isChecked){?> checked} + if($isDisabled){?> disabled} if(strlen($arParams['ID'])){?> id="=$arParams['ID']?>"} ?> @@ -79,6 +81,7 @@ if($isHint) { ?>
+