A free open source IT asset/license management system
Fixed #18502 - custom fields disappearing on smaller resolution breakpoints
snipec684b8ab1ea3
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.phpindex b94fb58a0c..3df2743a96 100755--- a/resources/views/hardware/checkout.blade.php+++ b/resources/views/hardware/checkout.blade.php@@ -157,7 +157,7 @@{!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}</div></div>-+<!-- Custom fields -->@include("models/custom_fields_form", ['model' => $asset->model,@@ -167,7 +167,8 @@@if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))- <div class="form-group notification-callout">+ <div class="row">+ <div class="notification-callout"><div class="col-md-8 col-md-offset-3"><div class="callout callout-info">@@ -190,6 +191,7 @@</div></div></div>+ </div>@endif</div> <!--/.box-body-->diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.phpindex a7da31250e..51f5de5146 100644--- a/resources/views/layouts/default.blade.php+++ b/resources/views/layouts/default.blade.php@@ -169,6 +169,11 @@border: 1px solid hsl(from var(--btn-theme-base) h s calc(l - 15)) !important;}+ .btn-theme.active+ {+ background-color: var(--btn-theme-hover) !important;+ }+.btn-theme:focus {color: var(--nav-primary-text-color) !important;}diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.phpindex 5f0b14c22c..0354596620 100644--- a/resources/views/models/custom_fields_form.blade.php+++ b/resources/views/models/custom_fields_form.blade.php@@ -1,10 +1,9 @@@if (($model) && ($model->fieldset) && $model->fieldset->displayAnyFieldsInForm($show_custom_fields_type ?? ''))- <div class="col-md-12 col-sm-12">+ <div class="row">+ <div class="col-md-12"><fieldset name="custom-fields">- <x-form-legend- help_text="{!! trans('admin/custom_fields/general.general_help_text') !!}">-+ <x-form-legend help_text="{!! trans('admin/custom_fields/general.general_help_text') !!}">{{ trans('admin/custom_fields/general.custom_fields') }}</x-form-legend>@@ -108,6 +107,8 @@@endforeach</fieldset></div>+ </div>+@endifdiff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.phpindex 30975d683c..09e25a3c53 100644--- a/resources/views/partials/forms/checkout-selector.blade.php+++ b/resources/views/partials/forms/checkout-selector.blade.php@@ -4,7 +4,7 @@<div class="btn-group" data-toggle="buttons">@if ((isset($user_select)) && ($user_select!='false'))- <label class="btn btn-default{{ (session('checkout_to_type') ?: 'user') == 'user' ? ' active' : '' }}">+ <label class="btn btn-theme{{ (session('checkout_to_type') ?: 'user') == 'user' ? ' active' : '' }}"><input name="checkout_to_type" value="user" aria-label="checkout_to_type"type="radio" {{ (session('checkout_to_type') ?: 'user') == 'user' ? 'checked' : '' }}><x-icon type="user" />@@ -12,7 +12,7 @@</label>@endif@if ((isset($asset_select)) && ($asset_select!='false'))- <label class="btn btn-default{{ session('checkout_to_type') == 'asset' ? ' active' : '' }}">+ <label class="btn btn-theme{{ session('checkout_to_type') == 'asset' ? ' active' : '' }}"><input name="checkout_to_type" value="asset" aria-label="checkout_to_type"type="radio" {{ session('checkout_to_type') == 'asset' ? 'checked': '' }}><i class="fas fa-barcode" aria-hidden="true"></i>@@ -20,7 +20,7 @@</label>@endif@if ((isset($location_select)) && ($location_select!='false'))- <label class="btn btn-default{{ session('checkout_to_type') == 'location' ? ' active' : '' }}">+ <label class="btn btn-theme{{ session('checkout_to_type') == 'location' ? ' active' : '' }}"><input name="checkout_to_type" value="location" aria-label="checkout_to_type"type="radio" {{ session('checkout_to_type') == 'location' ? 'checked' : '' }}><i class="fas fa-map-marker-alt" aria-hidden="true"></i>