From f1c196e609d74f7eb48aadd79973e3138fec0593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Thu, 13 Dec 2018 15:04:05 +0000 Subject: [PATCH] [FIX] portal: change width of portal modal to match backend Some features are common to portal and backend, such as the sign modal in enterprise. This commit uniformize the width of the modal to make it more consistent between the two by default. Of course themes can still customize this behavior. closes odoo/odoo#29521 --- addons/portal/static/src/scss/bootstrap_overridden.scss | 5 +++++ addons/web/static/src/scss/bootstrap_overridden.scss | 4 ++-- addons/web/static/src/scss/primary_variables.scss | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/portal/static/src/scss/bootstrap_overridden.scss b/addons/portal/static/src/scss/bootstrap_overridden.scss index 2fc73b519ae..fde568aa242 100644 --- a/addons/portal/static/src/scss/bootstrap_overridden.scss +++ b/addons/portal/static/src/scss/bootstrap_overridden.scss @@ -15,3 +15,8 @@ $font-size-sm: (12 / 16) * 1rem; $btn-padding-y-sm: (1 / 16) * 1rem; $btn-padding-x-sm: (5 / 16) * 1rem; + +// Modals + +$modal-lg: $o-modal-lg; +$modal-md: $o-modal-md; diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss index 09dd5ddbfd4..e8406c948e9 100644 --- a/addons/web/static/src/scss/bootstrap_overridden.scss +++ b/addons/web/static/src/scss/bootstrap_overridden.scss @@ -133,8 +133,8 @@ $modal-inner-padding: $o-horizontal-padding; // FIXME $modal-title-padding ? -$modal-lg: 980px; -$modal-md: 650px; +$modal-lg: $o-modal-lg; +$modal-md: $o-modal-md; // Breadcrumbs diff --git a/addons/web/static/src/scss/primary_variables.scss b/addons/web/static/src/scss/primary_variables.scss index e3b520e47f1..02835171794 100644 --- a/addons/web/static/src/scss/primary_variables.scss +++ b/addons/web/static/src/scss/primary_variables.scss @@ -65,6 +65,9 @@ $o-sheet-vpadding: 24px; $o-notification-error-bg-color: #F16567; $o-notification-info-bg-color: #FCFBEA; +$o-modal-lg: 980px; +$o-modal-md: 650px; + // Needed for having no spacing between sheet and mail body in mass_mailing: // Different required cancel paddings between web and web_enterprise $o-sheet-cancel-tpadding: 0px;