From 559a85e4f284bfd03bc6a3a5bf4397e2c4fa3a5f Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Wed, 14 May 2025 15:36:55 +0200 Subject: [PATCH] In the instance configuration some of the options displayed as block instead of inline --- .../admin/general_settings/edit.html.haml | 49 +++++++++++-------- app/webpacker/css/admin_v3/shared/forms.scss | 4 ++ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/app/views/spree/admin/general_settings/edit.html.haml b/app/views/spree/admin/general_settings/edit.html.haml index f4c8c813a2..d9062f2b2c 100644 --- a/app/views/spree/admin/general_settings/edit.html.haml +++ b/app/views/spree/admin/general_settings/edit.html.haml @@ -19,26 +19,32 @@ .alpha.six.columns %fieldset.legal.no-border-bottom %legend{:align => "center"}= t('.legal_settings') - .field - = preference_field_tag(:enterprises_require_tos, Spree::Config[:enterprises_require_tos], :type => Spree::Config.preference_type(:enterprises_require_tos)) - = label_tag(:enterprises_require_tos, t('.enterprises_require_tos')) + tag(:br) - .field - = preference_field_tag(:shoppers_require_tos, Spree::Config[:shoppers_require_tos], :type => Spree::Config.preference_type(:shoppers_require_tos)) - = label_tag(:shoppers_require_tos, t('.shoppers_require_tos')) + tag(:br) - .field - = preference_field_tag(:cookies_consent_banner_toggle, Spree::Config[:cookies_consent_banner_toggle], :type => Spree::Config.preference_type(:cookies_consent_banner_toggle)) - = label_tag(:cookies_consent_banner_toggle, t('.cookies_consent_banner_toggle')) + tag(:br) - .field - = preference_field_tag(:cookies_policy_matomo_section, Spree::Config[:cookies_policy_matomo_section], :type => Spree::Config.preference_type(:cookies_policy_matomo_section)) - = label_tag(:cookies_policy_matomo_section, t('.cookies_policy_matomo_section')) + tag(:br) - .field - = label_tag(:privacy_policy_url, t('.privacy_policy_url')) + tag(:br) - = preference_field_tag(:privacy_policy_url, Spree::Config[:privacy_policy_url], type: Spree::Config.preference_type(:privacy_policy_url)) + .label-inline + .field + = preference_field_tag(:enterprises_require_tos, Spree::Config[:enterprises_require_tos], :type => Spree::Config.preference_type(:enterprises_require_tos)) + = label_tag(:enterprises_require_tos, t('.enterprises_require_tos')) + tag(:br) + .label-inline + .field + = preference_field_tag(:shoppers_require_tos, Spree::Config[:shoppers_require_tos], :type => Spree::Config.preference_type(:shoppers_require_tos)) + = label_tag(:shoppers_require_tos, t('.shoppers_require_tos')) + tag(:br) + .label-inline + .field + = preference_field_tag(:cookies_consent_banner_toggle, Spree::Config[:cookies_consent_banner_toggle], :type => Spree::Config.preference_type(:cookies_consent_banner_toggle)) + = label_tag(:cookies_consent_banner_toggle, t('.cookies_consent_banner_toggle')) + tag(:br) + .label-inline + .field + = preference_field_tag(:cookies_policy_matomo_section, Spree::Config[:cookies_policy_matomo_section], :type => Spree::Config.preference_type(:cookies_policy_matomo_section)) + = label_tag(:cookies_policy_matomo_section, t('.cookies_policy_matomo_section')) + tag(:br) + .label-inline + .field + = label_tag(:privacy_policy_url, t('.privacy_policy_url')) + tag(:br) + = preference_field_tag(:privacy_policy_url, Spree::Config[:privacy_policy_url], type: Spree::Config.preference_type(:privacy_policy_url)) %fieldset.embedded_shopfronts.no-border-bottom %legend{:align => "center"}= t('admin.shopfront_settings.embedded_shopfront_settings') - .field - = preference_field_tag(:enable_embedded_shopfronts, Spree::Config[:enable_embedded_shopfronts], type: Spree::Config.preference_type(:enable_embedded_shopfronts)) - = label_tag(:enable_embedded_shopfronts, t('admin.shopfront_settings.enable_embedded_shopfronts')) + tag(:br) + .label-inline + .field + = preference_field_tag(:enable_embedded_shopfronts, Spree::Config[:enable_embedded_shopfronts], type: Spree::Config.preference_type(:enable_embedded_shopfronts)) + = label_tag(:enable_embedded_shopfronts, t('admin.shopfront_settings.enable_embedded_shopfronts')) + tag(:br) .field = label_tag(:embedded_shopfronts_whitelist, t('admin.shopfront_settings.embedded_shopfronts_whitelist')) + tag(:br) = preference_field_tag(:embedded_shopfronts_whitelist, Spree::Config[:embedded_shopfronts_whitelist], type: Spree::Config.preference_type(:embedded_shopfronts_whitelist)) @@ -73,9 +79,10 @@ = text_field_tag :currency_thousands_separator, Spree::Config[:currency_thousands_separator], :size => 3 %fieldset.number_localization.no-border-bottom %legend{:align => "center"}= t('admin.number_localization.number_localization_settings') - .field - = preference_field_tag(:enable_localized_number?, Spree::Config[:enable_localized_number?], type: Spree::Config.preference_type(:enable_localized_number?)) - = label_tag(:enable_localized_number?, t('admin.number_localization.enable_localized_number')) + tag(:br) + .label-inline + .field + = preference_field_tag(:enable_localized_number?, Spree::Config[:enable_localized_number?], type: Spree::Config.preference_type(:enable_localized_number?)) + = label_tag(:enable_localized_number?, t('admin.number_localization.enable_localized_number')) + tag(:br) %fieldset.available_units.no-border-bottom %legend{:align => "center"}= t('admin.available_units') .field diff --git a/app/webpacker/css/admin_v3/shared/forms.scss b/app/webpacker/css/admin_v3/shared/forms.scss index cd2729fa8d..a3e2b9fb76 100644 --- a/app/webpacker/css/admin_v3/shared/forms.scss +++ b/app/webpacker/css/admin_v3/shared/forms.scss @@ -79,6 +79,10 @@ label { display: block; } +.label-inline label { + display: inline; +} + span.info { font-style: italic; font-size: 85%;