From 8c55713dcc4f2a7165c4581150876aefd2760552 Mon Sep 17 00:00:00 2001 From: "stefanorigano (SRI)" Date: Fri, 9 Apr 2021 10:18:50 +0200 Subject: [PATCH] [FIX] web: tempusdominus lib assets order Allow to customize tempusdominus's default variables moving its assets at the end of the bundle. --- addons/web/__manifest__.py | 2 +- addons/web/static/src/legacy/scss/ui.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 90559898922..fcbc8875950 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -301,7 +301,6 @@ This module provides the core of the Odoo Web Client. 'web/static/lib/fontawesome/css/font-awesome.css', 'web/static/lib/select2/select2.css', 'web/static/lib/select2-bootstrap-css/select2-bootstrap.css', - 'web/static/lib/tempusdominus/tempusdominus.scss', 'web/static/fonts/fonts.scss', 'web/static/src/legacy/scss/ui.scss', 'web/static/src/legacy/scss/ui_extra.scss', @@ -320,6 +319,7 @@ 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/ui.scss b/addons/web/static/src/legacy/scss/ui.scss index 6cf669bb999..fac691a0028 100644 --- a/addons/web/static/src/legacy/scss/ui.scss +++ b/addons/web/static/src/legacy/scss/ui.scss @@ -1,3 +1,9 @@ +// 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-rgba: $border-color; + .o_hidden { display: none!important; }