From 21ec52766ce2557534caf66d78fb4109f8e7e860 Mon Sep 17 00:00:00 2001 From: NiclasNorin Date: Tue, 7 Jul 2026 11:28:17 +0200 Subject: [PATCH] fix: correcting styling for non standard field labels --- .../php/FieldMapping/Mapper/Acf/GoogleMapFieldMapper.php | 1 + source/php/FieldMapping/Mapper/Acf/RadioFieldMapper.php | 2 ++ .../php/FieldMapping/Mapper/Acf/WysiwygFieldMapper.php | 1 + source/php/Module/views/fields/googleMap.blade.php | 2 +- source/php/Module/views/fields/radio.blade.php | 2 +- source/php/Module/views/fields/wysiwyg.blade.php | 2 +- source/sass/main.scss | 9 --------- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/source/php/FieldMapping/Mapper/Acf/GoogleMapFieldMapper.php b/source/php/FieldMapping/Mapper/Acf/GoogleMapFieldMapper.php index f44a9289..66ad9945 100644 --- a/source/php/FieldMapping/Mapper/Acf/GoogleMapFieldMapper.php +++ b/source/php/FieldMapping/Mapper/Acf/GoogleMapFieldMapper.php @@ -27,6 +27,7 @@ public function map(): array $mapped['classList'][] = 'mod-frontend-form__openstreetmap'; // openstreetmap class is needed $mapped['classList'][] = 'openstreetmap'; + $mapped['classList'][] = 'c-field'; $mapped['attributeList']['style'] = sprintf( 'min-height: %spx; position: relative', diff --git a/source/php/FieldMapping/Mapper/Acf/RadioFieldMapper.php b/source/php/FieldMapping/Mapper/Acf/RadioFieldMapper.php index 35ce12f6..b735bfaa 100644 --- a/source/php/FieldMapping/Mapper/Acf/RadioFieldMapper.php +++ b/source/php/FieldMapping/Mapper/Acf/RadioFieldMapper.php @@ -28,6 +28,8 @@ public function map(): array $mapped['classList'][] = 'mod-frontend-form__field--radio--vertical'; } + $mapped['classList'][] = 'c-field'; + foreach ($this->field['choices'] as $key => $value) { $mapped['choices'][$key] = [ 'type' => $mapped['type'], diff --git a/source/php/FieldMapping/Mapper/Acf/WysiwygFieldMapper.php b/source/php/FieldMapping/Mapper/Acf/WysiwygFieldMapper.php index 7a5710a8..b80bfd63 100644 --- a/source/php/FieldMapping/Mapper/Acf/WysiwygFieldMapper.php +++ b/source/php/FieldMapping/Mapper/Acf/WysiwygFieldMapper.php @@ -20,6 +20,7 @@ public function map(): array unset($mapped['required']); } + $mapped['classList'][] = 'c-field'; $mapped['classList'][] = 'mod-frontend-form__wysiwyg'; return $mapped; diff --git a/source/php/Module/views/fields/googleMap.blade.php b/source/php/Module/views/fields/googleMap.blade.php index 957a47d4..e93c94a3 100644 --- a/source/php/Module/views/fields/googleMap.blade.php +++ b/source/php/Module/views/fields/googleMap.blade.php @@ -7,7 +7,7 @@ @typography([ 'element' => 'span', 'classList' => [ - 'mod-frontend-form__custom-label' + 'c-field__label' ], ]) {{ $field['label'] }} {!! !empty($field['attributeList']['data-js-required']) ? '*' : '' !!} diff --git a/source/php/Module/views/fields/radio.blade.php b/source/php/Module/views/fields/radio.blade.php index c97107ce..988b660f 100644 --- a/source/php/Module/views/fields/radio.blade.php +++ b/source/php/Module/views/fields/radio.blade.php @@ -7,7 +7,7 @@ @typography([ 'element' => 'span', 'classList' => [ - 'mod-frontend-form__custom-label' + 'c-field__label' ], ]) {{ $field['label'] }} {!! !empty($field['attributeList']['data-js-required']) ? '*' : '' !!} diff --git a/source/php/Module/views/fields/wysiwyg.blade.php b/source/php/Module/views/fields/wysiwyg.blade.php index a0200a48..9fa8f40a 100644 --- a/source/php/Module/views/fields/wysiwyg.blade.php +++ b/source/php/Module/views/fields/wysiwyg.blade.php @@ -7,7 +7,7 @@ @typography([ 'element' => 'span', 'classList' => [ - 'mod-frontend-form__custom-label' + 'c-field__label' ], ]) {{ $field['label'] }} {!! !empty($field['attributeList']['data-js-required']) ? '*' : '' !!} diff --git a/source/sass/main.scss b/source/sass/main.scss index 42507848..196610dd 100644 --- a/source/sass/main.scss +++ b/source/sass/main.scss @@ -46,15 +46,6 @@ margin-top: 4px; } - .mod-frontend-form__custom-label { - color: var(--c-field-label-color, var(--color-darker, #565656)); - font-size: var(--c-field-label-font-size, .75rem); - font-weight: var(--c-field-label-font-weight, 700); - letter-spacing: .05rem; - margin-bottom: calc(var(--base, 8px) / 2); - text-transform: var(--c-field-label-text-transform, uppercase); - } - .mod-frontend-form__disclaimer mark { font-style: italic; background: unset;