From 713ce7836f2151a657fdf865fa9792ea9b4fbe7f Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 29 May 2024 13:07:33 -0700 Subject: [PATCH 1/2] add some css in label field selector --- .../views/partials/label2-field-definitions.blade.php | 11 ++++++++--- resources/views/settings/labels.blade.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index 2a44fbf257..5e61513817 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -261,13 +261,18 @@

Fields

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 6f3694caff..7db98e2586 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -216,7 +216,7 @@ {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
- @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields ]) + @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields, 'template' => $setting->label2_template]) {!! $errors->first('label2_fields', '') !!}

{{ trans('admin/settings/general.label2_fields_help') }}

From e28ad50becd18eea507d7525b3ab8de0f66929cf Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 29 May 2024 15:34:08 -0700 Subject: [PATCH 2/2] fixes the color change --- resources/views/partials/label2-field-definitions.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index 5e61513817..efae291d2e 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -270,7 +270,7 @@ 'l2fd-listitem': true, 'selected': selectedField === field }" - x-bind:style="index < 4 && template === 'DefaultLabel' ? 'background-color:#EEEEEE;' : ''" + x-bind:style="index < 4 && template === 'DefaultLabel' ? 'background-color:#EEEEEE;' : 'background-color:#FFF;'" x-on:click="selectedField = field" >