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; }