From 986739c8abb483841913da12be540f4586c7ea07 Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Tue, 14 Sep 2021 10:40:58 +0000 Subject: [PATCH] [FIX] web: DateTimePicker (S)CSS loading order Following commit odoo/odoo@8c55713dcc4f2a7165c4581150876aefd2760552 , the DateTimePicker (TempusDominus) library's SCSS file was pushed so low in the (S)CSS assets loading order that it overrides the Odoo specific customizations (done in `datepicker.scss` file). This commit restores the correct loading order, also taking into account the changes (i.e. variables) introduced in the afore mentionned commit and fixing necessary CSS rules (cf. selected day's color) to keep the same styling. X-original-commit: 7fd486cd93154d680cb69e3f34aa04478bc62a63 Part-of: odoo/odoo#79497 --- addons/web/__manifest__.py | 3 ++- addons/web/static/src/legacy/scss/datepicker.scss | 3 ++- .../static/src/legacy/scss/tempusdominus_overridden.scss | 6 ++++++ addons/web/static/src/legacy/scss/ui.scss | 7 ------- 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 addons/web/static/src/legacy/scss/tempusdominus_overridden.scss diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 4b615292a39..3dce384868c 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -325,6 +325,8 @@ This module provides the core of the Odoo Web Client. 'web/static/src/legacy/scss/bootstrap_overridden_frontend.scss', ], 'web._assets_common_styles': [ + 'web/static/src/legacy/scss/tempusdominus_overridden.scss', + 'web/static/lib/tempusdominus/tempusdominus.scss', 'web/static/lib/jquery.ui/jquery-ui.css', 'web/static/lib/fontawesome/css/font-awesome.css', 'web/static/lib/select2/select2.css', @@ -347,7 +349,6 @@ This module provides the core of the Odoo Web Client. 'web/static/src/legacy/scss/web.zoomodoo.scss', 'web/static/src/legacy/scss/color_picker.scss', 'web/static/src/legacy/scss/fontawesome_overridden.scss', - 'web/static/lib/tempusdominus/tempusdominus.scss', ], 'web._assets_common_scripts': [ 'web/static/lib/underscore/underscore.js', diff --git a/addons/web/static/src/legacy/scss/datepicker.scss b/addons/web/static/src/legacy/scss/datepicker.scss index c3696891d73..fdbd409779f 100644 --- a/addons/web/static/src/legacy/scss/datepicker.scss +++ b/addons/web/static/src/legacy/scss/datepicker.scss @@ -81,12 +81,13 @@ div.dropdown-menu.bootstrap-datetimepicker-widget { td { font-size: ($font-size-base + $font-size-sm) * .5; - &.today:before { + &.today:not(.active):before { border-bottom-color: $o-brand-primary; } &.active { border-bottom-color: $bs-datetimepicker-active-color; + color: $bs-datetimepicker-active-color; } } } diff --git a/addons/web/static/src/legacy/scss/tempusdominus_overridden.scss b/addons/web/static/src/legacy/scss/tempusdominus_overridden.scss new file mode 100644 index 00000000000..1fd08ce7221 --- /dev/null +++ b/addons/web/static/src/legacy/scss/tempusdominus_overridden.scss @@ -0,0 +1,6 @@ +// Override Tempusdominus variables +$bs-datetimepicker-active-bg: $o-brand-odoo; +$bs-datetimepicker-active-color: $white; +$bs-datetimepicker-text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +$bs-datetimepicker-secondary-border-color: $dropdown-border-color; +$bs-datetimepicker-secondary-border-color-rgba: $dropdown-border-color; diff --git a/addons/web/static/src/legacy/scss/ui.scss b/addons/web/static/src/legacy/scss/ui.scss index d8a467afe0d..4aad2bb0d0e 100644 --- a/addons/web/static/src/legacy/scss/ui.scss +++ b/addons/web/static/src/legacy/scss/ui.scss @@ -1,10 +1,3 @@ -// Override Tempusdominus variables -$bs-datetimepicker-active-bg: $o-brand-odoo; -$bs-datetimepicker-active-color: $white; -$bs-datetimepicker-text-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -$bs-datetimepicker-secondary-border-color: $dropdown-border-color; -$bs-datetimepicker-secondary-border-color-rgba: $dropdown-border-color; - .o_hidden { display: none!important; }