extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar's user header not working in jdots template

Browse Source
This commit is contained in:
Hadi Nategh 2016-09-28 16:44:44 +02:00
parent 8d5f2c45b4
commit 1c18fed409
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,13 +332,13 @@ Hide subsequent headers in week view with non-consolidated owners
} }
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer
{ {
height: ~"calc(1.5em + 5px)"; height:calc(1.5em + 5px);
} }
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
white-space:nowrap; white-space:nowrap;
display: block; display: block;
position: static; position: static;
width: ~"calc(100% - 58px)"; width: calc(100% - 58px);
margin-left: 58px; margin-left: 58px;
color: white; color: white;
background-color: #2D6393; background-color: #2D6393;

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

@ -332,13 +332,13 @@ Hide subsequent headers in week view with non-consolidated owners
top: 2em; top: 2em;
} }
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
height: calc(1.5em + 5px); height: calc(6.5em);
} }
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
white-space: nowrap; white-space: nowrap;
display: block; display: block;
position: static; position: static;
width: calc(100% - 58px); width: calc(42%);
margin-left: 58px; margin-left: 58px;
color: white; color: white;
background-color: #2D6393; background-color: #2D6393;
@ -1389,12 +1389,14 @@ input#calendar-edit_location {
to see if it still fits. to see if it still fits.
*/ */
@media all and (max-width: 1000px) and (min-width: 481px) { @media all and (max-width: 1000px) and (min-width: 481px) {
/* styles assigned when width is smaller than 1000px */
.calendar_calDayColHeader > div[data-date] .long_date { .calendar_calDayColHeader > div[data-date] .long_date {
display: inline; display: inline;
} }
.calendar_calDayColHeader > div[data-date] .short_date { .calendar_calDayColHeader > div[data-date] .short_date {
display: none; display: none;
} }
/* 7 day needs short day labels */
.calendar_calDayColHeader:first-child:nth-last-child(7) > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(7) > div[data-date] .short_date,
.calendar_calDayColHeader:first-child:nth-last-child(7) ~ .calendar_calDayColHeader > div[data-date] .short_date { .calendar_calDayColHeader:first-child:nth-last-child(7) ~ .calendar_calDayColHeader > div[data-date] .short_date {
display: inline; display: inline;
@ -1415,10 +1417,12 @@ input#calendar-edit_location {
} }
} }
@media all and (max-width: 480px) { @media all and (max-width: 480px) {
/* styles assigned when width is smaller than 480px; */
.calendar_calDayColHeader > div[data-date] .long_date, .calendar_calDayColHeader > div[data-date] .long_date,
.calendar_calDayColHeader > div[data-date] .short_date { .calendar_calDayColHeader > div[data-date] .short_date {
display: none; display: none;
} }
/* 5 day and less fits short day labels */
.calendar_calDayColHeader:first-child:nth-last-child(3) > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(3) > div[data-date] .short_date,
.calendar_calDayColHeader:first-child:nth-last-child(3) ~ .calendar_calDayColHeader > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(3) ~ .calendar_calDayColHeader > div[data-date] .short_date,
.calendar_calDayColHeader:first-child:nth-last-child(4) > div[data-date] .short_date, .calendar_calDayColHeader:first-child:nth-last-child(4) > div[data-date] .short_date,
@ -1427,6 +1431,7 @@ input#calendar-edit_location {
.calendar_calDayColHeader:first-child:nth-last-child(5) ~ .calendar_calDayColHeader > div[data-date] .short_date { .calendar_calDayColHeader:first-child:nth-last-child(5) ~ .calendar_calDayColHeader > div[data-date] .short_date {
display: inline; display: inline;
} }
/* 2 day view and less has enough room for full label */
.calendar_calDayColHeader:first-child:nth-last-child(1) > div[data-date] .long_date, .calendar_calDayColHeader:first-child:nth-last-child(1) > div[data-date] .long_date,
.calendar_calDayColHeader:first-child:nth-last-child(1) ~ .calendar_calDayColHeader > div[data-date] .long_date, .calendar_calDayColHeader:first-child:nth-last-child(1) ~ .calendar_calDayColHeader > div[data-date] .long_date,
.calendar_calDayColHeader:first-child:nth-last-child(2) > div[data-date] .long_date, .calendar_calDayColHeader:first-child:nth-last-child(2) > div[data-date] .long_date,
@ -2675,5 +2680,11 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
#calendar_merge { #calendar_merge {
margin: 9px 0 0 0; margin: 9px 0 0 0;
} }
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
height: calc(1.5em + 5px);
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
width: calc(100% - 58px);
}
/* ######################################################################################## /* ########################################################################################
/* * Calendar END */ /* * Calendar END */

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

@ -1278,6 +1278,14 @@ div#calendar-container {
// insert a document // insert a document
#calendar_merge {margin: 9px 0 0 0;} #calendar_merge {margin: 9px 0 0 0;}
#calendar-view_view.hideDayColHeader
{
tr {
&:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {height: ~"calc(1.5em + 5px)";}
.calendar_calGridHeader > span.et2_label {width:~"calc(100% - 58px)";}
}
}
/* ######################################################################################## /* ########################################################################################
/* * Calendar END */ /* * Calendar END */