diff --git a/addons/hr/static/src/img/icons/hatched_dark.svg b/addons/hr/static/src/img/icons/hatched_dark.svg new file mode 100644 index 00000000000..1be4354ddc1 --- /dev/null +++ b/addons/hr/static/src/img/icons/hatched_dark.svg @@ -0,0 +1 @@ + diff --git a/addons/hr/static/src/img/icons/line_dark.svg b/addons/hr/static/src/img/icons/line_dark.svg new file mode 100644 index 00000000000..37846bd33f2 --- /dev/null +++ b/addons/hr/static/src/img/icons/line_dark.svg @@ -0,0 +1 @@ + diff --git a/addons/hr/static/src/img/icons/plain_dark.svg b/addons/hr/static/src/img/icons/plain_dark.svg new file mode 100644 index 00000000000..e45b1c3229f --- /dev/null +++ b/addons/hr/static/src/img/icons/plain_dark.svg @@ -0,0 +1 @@ + diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.scss b/addons/hr_holidays/static/src/dashboard/time_off_card.scss index ef4c036603f..ac956af2e34 100644 --- a/addons/hr_holidays/static/src/dashboard/time_off_card.scss +++ b/addons/hr_holidays/static/src/dashboard/time_off_card.scss @@ -24,6 +24,7 @@ img { height: 30px; + filter: var(--timeOffCard-icon-filter); } } diff --git a/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.scss b/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.scss new file mode 100644 index 00000000000..64678abaf28 --- /dev/null +++ b/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.scss @@ -0,0 +1,15 @@ +.o_calendar_filter img { + width:30px; + + &.o_calendar_filter_plain { + content:var(--calendarFilter-icon--plain); + } + + &.o_calendar_filter_hatched { + content:var(--calendarFilter-icon--hatched); + } + + &.o_calendar_filter_line { + content:var(--calendarFilter-icon--line); + } +} diff --git a/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.xml b/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.xml index 007373e0bb8..b6af3492bdc 100644 --- a/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.xml +++ b/addons/hr_holidays/static/src/views/calendar/filter_panel/calendar_filter_panel.xml @@ -7,9 +7,9 @@
Legend
- Validated - To Approve - Refused + Validated + To Approve + Refused
diff --git a/addons/hr_holidays/views/hr_views.xml b/addons/hr_holidays/views/hr_views.xml index 0f7d3fc2171..52d6fbe9beb 100644 --- a/addons/hr_holidays/views/hr_views.xml +++ b/addons/hr_holidays/views/hr_views.xml @@ -50,8 +50,7 @@ -
Absence diff --git a/addons/point_of_sale/views/res_config_settings_views.xml b/addons/point_of_sale/views/res_config_settings_views.xml index 98c329073c1..3cbbe07b377 100644 --- a/addons/point_of_sale/views/res_config_settings_views.xml +++ b/addons/point_of_sale/views/res_config_settings_views.xml @@ -19,7 +19,7 @@
-
+
diff --git a/addons/project/static/src/components/project_control_panel/project_control_panel.xml b/addons/project/static/src/components/project_control_panel/project_control_panel.xml index 7d97a0b7e5c..0d4555ec9ac 100644 --- a/addons/project/static/src/components/project_control_panel/project_control_panel.xml +++ b/addons/project/static/src/components/project_control_panel/project_control_panel.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml index a7a32ce0554..82cba1e9723 100644 --- a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml +++ b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml @@ -2,7 +2,7 @@ -
+
-

To Send +
-

Waiting + diff --git a/addons/rating/views/rating_rating_views.xml b/addons/rating/views/rating_rating_views.xml index ab55e80e50b..2e67a51ab29 100644 --- a/addons/rating/views/rating_rating_views.xml +++ b/addons/rating/views/rating_rating_views.xml @@ -93,7 +93,7 @@
- +
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml index 22b52a9c03d..5d504f01bc6 100644 --- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml +++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml @@ -24,7 +24,7 @@ groups="getDashboardGroups()"/> -
+
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml index a1520cc0893..f76c6f53b6a 100644 --- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml +++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/mobile_search_panel/mobile_search_panel.xml @@ -11,7 +11,7 @@
-
+
diff --git a/addons/stock/static/src/scss/report_stock_forecasted.scss b/addons/stock/static/src/scss/report_stock_forecasted.scss index 335e077614d..c66367e5433 100644 --- a/addons/stock/static/src/scss/report_stock_forecasted.scss +++ b/addons/stock/static/src/scss/report_stock_forecasted.scss @@ -8,9 +8,6 @@ } } - .o_forecasted_row { - background-color: #dee2e6; - } .o_priority { display: inline-block; @@ -29,5 +26,5 @@ } .table td { vertical-align: middle; - } + } } diff --git a/addons/survey/static/src/img/trophy-solid.svg b/addons/survey/static/src/img/trophy-solid.svg index 543ed227116..4e149d2b9f5 100644 --- a/addons/survey/static/src/img/trophy-solid.svg +++ b/addons/survey/static/src/img/trophy-solid.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/addons/survey/static/src/scss/survey_survey_views.scss b/addons/survey/static/src/scss/survey_survey_views.scss index 55b90d12206..8c538050f8f 100644 --- a/addons/survey/static/src/scss/survey_survey_views.scss +++ b/addons/survey/static/src/scss/survey_survey_views.scss @@ -3,8 +3,8 @@ // Common: left semi-trophy icon for certifications .o_survey_kanban_card_certification { background-image: - linear-gradient(rgba(255,255,255,.9), - rgba(255,255,255,.9)), + linear-gradient(rgba($o-view-background-color,.75), + rgba($o-view-background-color,.75)), url(/survey/static/src/img/trophy-solid.svg); background-repeat: no-repeat; background-position: bottom 6px left -45px; @@ -31,9 +31,6 @@ width: 100%; margin: 0px; border-top: 0px !important; - &:first-child { - border-bottom: 1px solid #dee2e6 !important; - } } } @@ -65,8 +62,8 @@ // Left semi-trophy icon for certifications: tweak display for list view .o_survey_kanban_card_certification { - background-position: bottom 6px left -30px; - background-size: 100%, 65px; + background-position: center left -35px; + background-size: auto 75%; } // Due to activity widget crashing if present twice, have to set absolute and tweak