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

[FIX] calendar, web: bring back hatched and striked styles in Year view

Browse Source 
During the revamp (https://github.com/odoo/odoo/pull/138670) the
classes `.o_event_hatched` and `.o_event_striked` were moved.
The `o_event_hatched` works on day, week, and month
view but not in Year view of the `hr_holidays` module where the events
all look like they have the same status. The `o_event_striked`
was removed by mistake.
To fix this issue, we move the `.o_event_hatched` where it isn't under
the `.fc-event` selector (because this one doesn't exist in Year view),
and we put back `o_event_striked`.

task-3617333
part of task-3575827

closes odoo/odoo#144208

Signed-off-by: Romeo Fragomeli (rfr) <rfr@odoo.com>
This commit is contained in:
Elisabeth Dickinson
2024-02-26 11:41:53 +00:00
committed by Brieuc-brd
parent c7f9827746
commit 575283c3c1
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/static/src/scss/calendar.scss
-12
View File
@@ -44,18 +44,6 @@
&.o_attendee_status_declined {
--o-bg-opacity: 0;
}
&.o_attendee_status_tentative, &.o_event_hatched {
.fc-bg {
background: repeating-linear-gradient(
45deg,
RGBA(var(--o-event-bg-rgb, #{to-rgb($info)}), .3),
RGBA(var(--o-event-bg-rgb, #{to-rgb($info)}), .3) 10px,
RGBA(var(--o-event-bg-rgb, #{to-rgb($info)}), .6) 10px,
RGBA(var(--o-event-bg-rgb, #{to-rgb($info)}), .6) 20px
) !important;
}
}
}
&.o_event_dot {
addons/web/static/src/views/calendar/calendar_renderer.scss
+17
View File
@@ -597,6 +597,23 @@
background-color: $color-subtle;
}
&.o_event_hatched:not(.o_event_dot):not(.fc-day-grid-event), &.o_event_hatched.fc-day-grid-event .fc-bg, &.o_attendee_status_tentative:not(.o_event_dot) .fc-bg {
background: repeating-linear-gradient(
45deg,
RGBA(to-rgb($color), .3),
RGBA(to-rgb($color), .3) 10px,
RGBA(to-rgb($color), .6) 10px,
RGBA(to-rgb($color), .6) 20px
) !important;
}
&.o_event_striked:not(.o_event_dot) {
background: linear-gradient(
transparent 0 45%,
$color 45% 55%,
transparent 55% 100%);
}
&.fc-event:not(.o_event_dot):not(.fc-dragging) {
color: color-contrast($color-subtle);
border-color: tint-color($color, 50%);