diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 65da83f31..f2463d46c 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -2423,12 +2423,15 @@ label{font-size:12px} .input-with-icon.right-align input{padding-right:32px !important} .input-with-icon.left-align > .icon{left:0} .input-with-icon.left-align input{padding-left:32px !important} +.field-section{border-bottom:1px solid #e0e0e0;padding-top:3px;padding-bottom:7px} +.field-section > p:first-child,.field-section > h4:first-child{margin:0} .field-textarea{resize:vertical} .field-textarea.size-tiny{min-height:50px} .field-textarea.size-small{min-height:100px} .field-textarea.size-large{min-height:200px} .field-textarea.size-huge{min-height:250px} .field-textarea.size-giant{min-height:350px} +.field-checkboxlist .checkbox:last-of-type{margin-bottom:0} .field-checkboxlist-scrollable{background:white;border:1px solid #e2e2e2;padding-left:15px;height:300px} .field-checkboxlist-scrollable .checkbox{margin-top:15px;margin-bottom:5px} .field-checkboxlist-scrollable .checkbox ~ .checkbox{margin-top:0} diff --git a/modules/backend/assets/less/controls/forms.less b/modules/backend/assets/less/controls/forms.less index 686b1b2ff..163ad4823 100644 --- a/modules/backend/assets/less/controls/forms.less +++ b/modules/backend/assets/less/controls/forms.less @@ -224,6 +224,17 @@ label { } } +.field-section { + border-bottom: 1px solid @color-form-field-border; + padding-top: 3px; + padding-bottom: 7px; + + > p:first-child, + > h4:first-child { + margin: 0; + } +} + .field-textarea { resize: vertical; &.size-tiny { min-height: @size-tiny; } @@ -233,6 +244,12 @@ label { &.size-giant { min-height: @size-giant; } } +.field-checkboxlist { + .checkbox:last-of-type { + margin-bottom: 0; + } +} + .field-checkboxlist-scrollable { background: white; border: 1px solid @color-list-border; diff --git a/modules/backend/widgets/form/partials/_field.htm b/modules/backend/widgets/form/partials/_field.htm index c286ed675..7b126c847 100644 --- a/modules/backend/widgets/form/partials/_field.htm +++ b/modules/backend/widgets/form/partials/_field.htm @@ -1,6 +1,6 @@ hidden): ?> - type, ['checkbox', 'switch'])): ?> + type, ['checkbox', 'switch', 'section'])): ?> makePartial('field_'.$field->type, ['field' => $field]) ?> diff --git a/modules/backend/widgets/form/partials/_field_checkboxlist.htm b/modules/backend/widgets/form/partials/_field_checkboxlist.htm index 6ebe62e1f..52e0af915 100644 --- a/modules/backend/widgets/form/partials/_field_checkboxlist.htm +++ b/modules/backend/widgets/form/partials/_field_checkboxlist.htm @@ -5,85 +5,86 @@ - previewMode): ?> - +
- $option): ?> - getId().'_'.$index; - if (!in_array($value, $checkedValues)) continue; - if (is_string($option)) $option = [$option]; - ?> -
- + previewMode): ?> - - -

- -
- + $option): ?> + getId().'_'.$index; + if (!in_array($value, $checkedValues)) continue; + if (is_string($option)) $option = [$option]; + ?> +
+ - - - - 10): ?> - - - : - , - - - - -
-
- - - - - $option): ?> - getId().'_'.$index; - if (is_string($option)) $option = [$option]; - ?> -
- > - - - -

- -
- - - 10): ?> + + +

+
-
+ + + + + 10): ?> + + + : + , + + + + +
+
+ + + + + $option): ?> + getId().'_'.$index; + if (is_string($option)) $option = [$option]; + ?> +
+ > + + + +

+ +
+ + + 10): ?> +
+
+ + - - +
diff --git a/modules/backend/widgets/form/partials/_field_section.htm b/modules/backend/widgets/form/partials/_field_section.htm new file mode 100644 index 000000000..ce3e74007 --- /dev/null +++ b/modules/backend/widgets/form/partials/_field_section.htm @@ -0,0 +1,10 @@ + +
+ label): ?> +

label)) ?>

+ + + comment): ?> +

comment)) ?>

+ +
\ No newline at end of file