From bdeab2e8e1349b9e14b7cf32304936733b2a0faa Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 13 Sep 2022 14:45:14 +0200 Subject: [PATCH] Fix calendar user's header styling --- calendar/templates/default/app.css | 8 ++-- calendar/templates/mobile/app.css | 6 +-- calendar/templates/pixelegg/app.css | 59 +++------------------------- calendar/templates/pixelegg/app.less | 2 +- 4 files changed, 13 insertions(+), 62 deletions(-) diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index 951d84776d..50e6b1f1be 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -40,10 +40,10 @@ } /* Let hidden user names be visible */ - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { position: static; } - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { overflow: visible !important; } @@ -350,7 +350,7 @@ Hide subsequent headers in week view with non-consolidated owners #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] { display:none; } -#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > span.et2_label +#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > et2-description { position: absolute; top: 2em; @@ -359,7 +359,7 @@ Hide subsequent headers in week view with non-consolidated owners { height:calc(1.5em + 32px); } -#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { +#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > et2-description { white-space:nowrap; display: block; position: static; diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css index a661c80841..0d4e6a55d4 100644 --- a/calendar/templates/mobile/app.css +++ b/calendar/templates/mobile/app.css @@ -63,10 +63,10 @@ overflow-y: hidden !important; } /* Let hidden user names be visible */ - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { position: static; } - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { overflow: visible !important; } div.calendar_calEvent { @@ -2666,7 +2666,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { height: calc(1.5em + 32px); } -#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { +#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > et2-description { width: calc(100% - 58px); } #calendar-toolbar_toolbar et2-switch .label.on span.off { diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 5774e71075..2ec0cd585e 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -51,10 +51,10 @@ overflow-y: hidden !important; } /* Let hidden user names be visible */ - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { position: static; } - #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { + #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > et2-description { overflow: visible !important; } div.calendar_calEvent { @@ -91,55 +91,6 @@ #calendar-sidebox_weekend { /* Special css styling goes here */ } -#calendar-sidebox_date .calendar_calHoliday { - background-color: rgba(103, 159, 210, 0.5); -} -#calendar-sidebox_date .flatpickr-months { - gap: 0; - background-color: initial; -} -#calendar-sidebox_date .flatpickr-months > * { - background-repeat: no-repeat; -} -#calendar-sidebox_date .flatpickr-months > *:hover { - background-color: initial !important; - box-shadow: none; -} -#calendar-sidebox_date .flatpickr-months .flatpickr-month { - min-width: 16ch; - height: initial; - background-color: initial; -} -#calendar-sidebox_date .flatpickr-current-month { - height: 25px; - font-size: 100%; - width: 100%; - min-width: 7ch; - left: 0; - display: flex; - align-items: stretch; - padding: 0px; -} -#calendar-sidebox_date .flatpickr-current-month select { - padding: 0 !important; - background-color: initial; -} -#calendar-sidebox_date .flatpickr-current-month .numInputWrapper { - width: 7ch; - min-width: 7ch; - flex: 0; -} -#calendar-sidebox_date .flatpickr-current-month .numInputWrapper:hover { - background-color: initial; -} -#calendar-sidebox_date .flatpickr-current-month input.cur-year { - padding-top: 3px; -} -#calendar-sidebox_date div.flatpickr-calendar.inline .flatpickr-current-month .flatpickr-monthDropdown-months { - width: 100%; - padding: 0; - flex: 1 1 auto; -} #calendar-sidebox_date div.flatpickr-calendar.inline { width: 100% !important; } @@ -394,14 +345,14 @@ Hide subsequent headers in week view with non-consolidated owners #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] { display: none; } -#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > span.et2_label { +#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > et2-description { position: absolute; top: 2em; } #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { height: calc(1.5em + 32px); } -#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { +#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > et2-description { white-space: nowrap; display: block; position: static; @@ -2703,7 +2654,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { height: calc(1.5em + 32px); } -#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { +#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > et2-description { width: calc(100% - 58px); } #calendar-toolbar_toolbar et2-switch .label.on span.off { diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index f012e53b72..6b64bea83e 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -1127,7 +1127,7 @@ div#calendar-container { { tr { &:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {height: ~"calc(1.5em + 32px)";} - .calendar_calGridHeader > span.et2_label {width:~"calc(100% - 58px)";} + .calendar_calGridHeader > et2-description {width:~"calc(100% - 58px)";} } } #calendar-toolbar_toolbar {