holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - Week view with multiple users now keeps date heading at the top

Browse Source
This commit is contained in:
nathangray 2017-06-30 09:47:00 -06:00
parent 82d90188a1
commit efe9478d84
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/templates/default/app.css
View File

@ -238,7 +238,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
/* marks a day in the colum-header as today /* marks a day in the colum-header as today
*/ */
.calendar_calToday{ .calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
background: #ffffcc; background: #ffffcc;
} }
.calendar_calWeek{ .calendar_calWeek{
@ -256,7 +257,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
/* marks a day in the colum-header as holiday /* marks a day in the colum-header as holiday
*/ */
.calendar_calHoliday{ .calendar_calHoliday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calHoliday.et2_link.et2_clickable {
background-color: rgba(103, 159, 210, 0.5); background-color: rgba(103, 159, 210, 0.5);
} }
/* marks a day in the column-header additionaly as birthday of some contact, /* marks a day in the column-header additionaly as birthday of some contact,
@ -452,6 +454,7 @@ Hide subsequent headers in week view with non-consolidated owners
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
background-color: white;
} }
/* Seperate long and short day names */ /* Seperate long and short day names */
@ -463,6 +466,12 @@ Hide subsequent headers in week view with non-consolidated owners
display: none; display: none;
} }
/* Keep header dates when showing one week, multiple users */
.calendar_calTimeGridFixed:not(.calendar_TimeGridNoLabel) .calendar_calDayColHeader > div.et2_clickable.et2_link {
position: fixed;
width: inherit;
margin-top: -1px;
}
/* Indicators for offscreen events */ /* Indicators for offscreen events */
.calendar_calDayColHeader .hiddenEventBefore, .calendar_calDayCol .hiddenEventAfter { .calendar_calDayColHeader .hiddenEventBefore, .calendar_calDayCol .hiddenEventAfter {
width: 80%; width: 80%;

16
calendar/templates/pixelegg/app.css
View File

@ -244,7 +244,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* marks a day in the colum-header as today /* marks a day in the colum-header as today
*/ */
.calendar_calToday { .calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
background: #ffffcc; background: #ffffcc;
} }
.calendar_calWeek { .calendar_calWeek {
@ -261,7 +262,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* marks a day in the colum-header as holiday /* marks a day in the colum-header as holiday
*/ */
.calendar_calHoliday { .calendar_calHoliday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calHoliday.et2_link.et2_clickable {
background-color: rgba(103, 159, 210, 0.5); background-color: rgba(103, 159, 210, 0.5);
} }
/* marks a day in the column-header additionaly as birthday of some contact, /* marks a day in the column-header additionaly as birthday of some contact,
@ -452,6 +454,7 @@ Hide subsequent headers in week view with non-consolidated owners
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
background-color: white;
} }
/* Seperate long and short day names */ /* Seperate long and short day names */
.calendar_calDayColHeader > div[data-date] .short_date, .calendar_calDayColHeader > div[data-date] .short_date,
@ -461,6 +464,12 @@ Hide subsequent headers in week view with non-consolidated owners
.calendar_calDayColHeader > div[data-date] .short_date { .calendar_calDayColHeader > div[data-date] .short_date {
display: none; display: none;
} }
/* Keep header dates when showing one week, multiple users */
.calendar_calTimeGridFixed:not(.calendar_TimeGridNoLabel) .calendar_calDayColHeader > div.et2_clickable.et2_link {
position: fixed;
width: inherit;
margin-top: -1px;
}
/* Indicators for offscreen events */ /* Indicators for offscreen events */
.calendar_calDayColHeader .hiddenEventBefore, .calendar_calDayColHeader .hiddenEventBefore,
.calendar_calDayCol .hiddenEventAfter { .calendar_calDayCol .hiddenEventAfter {
@ -1987,7 +1996,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
} }
/* marks a day in the colum-header as today /* marks a day in the colum-header as today
*/ */
.calendar_calToday { .calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
background-color: #ffc200; background-color: #ffc200;
} }
.calendar_calWeek { .calendar_calWeek {

3
calendar/templates/pixelegg/app.less
View File

@ -619,7 +619,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
/* marks a day in the colum-header as today /* marks a day in the colum-header as today
*/ */
.calendar_calToday{ .calendar_calToday,
.calendar_calTimeGrid .calendar_calDayColHeader .calendar_calToday.et2_link.et2_clickable {
// background: #ffffcc; // background: #ffffcc;
.background_table_cal_head; .background_table_cal_head;
} }