diff options
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/lib/fullcalendar/timegrid/main.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/scss/web_calendar.scss | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/addons/web/static/lib/fullcalendar/timegrid/main.js b/addons/web/static/lib/fullcalendar/timegrid/main.js index 086625fac52..0ffebd672ac 100644 --- a/addons/web/static/lib/fullcalendar/timegrid/main.js +++ b/addons/web/static/lib/fullcalendar/timegrid/main.js @@ -267,7 +267,9 @@ Docs & License: https://fullcalendar.io/ } // if the event is short that the title will be cut off, // attach a className that condenses the title into the time area. - if (seg.eventRange.def.title && seg.bottom - seg.top < 30) { + //if (seg.eventRange.def.title && seg.bottom - seg.top < 30) { + // ODOO FIX: fc-short without title as done in 3.0 and 5.0 + if (seg.bottom - seg.top < 30) { seg.el.classList.add('fc-short'); // TODO: "condensed" is a better name } } diff --git a/addons/web/static/src/scss/web_calendar.scss b/addons/web/static/src/scss/web_calendar.scss index e256e575812..f7e40fbe4e4 100644 --- a/addons/web/static/src/scss/web_calendar.scss +++ b/addons/web/static/src/scss/web_calendar.scss @@ -51,6 +51,11 @@ $o-cw-filter-avatar-size: 20px; font-weight: 500; } + // Try to show one full lien for short event + &.fc-short .fc-content { + margin-top: 1px; + } + &.o_cw_custom_highlight { z-index: 10!important; @@ -208,6 +213,7 @@ $o-cw-filter-avatar-size: 20px; // Try to avoid showing no title for short event &.fc-short { padding-top: 0; + padding-bottom: 0; } } |