pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: DateTimePicker (S)CSS loading order

Browse Source 
Following commit odoo/odoo@8c55713dcc ,
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
This commit is contained in:
Pierre Paridans
2021-11-09 10:10:58 +00:00
parent ade64948ab
commit 986739c8ab
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/__manifest__.py
+2 -1
View File
@@ -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',
addons/web/static/src/legacy/scss/datepicker.scss
+2 -1
View File
@@ -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;
}
}
}
addons/web/static/src/legacy/scss/tempusdominus_overridden.scss
+6
View File
@@ -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;
addons/web/static/src/legacy/scss/ui.scss
-7
View File
@@ -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;
}