mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 16:29:22 +01:00
Some more style changes:
- Whole day header background color fixed - Italic removed from birthdays - Default color changed to blue - Holiday colors changed to a little lighter color
This commit is contained in:
parent
80ce556003
commit
01471c3d61
@ -582,7 +582,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reset
|
// Reset
|
||||||
event.title.css('top','');
|
event.title.css({'top':'','background-color':''});
|
||||||
event.body.css('padding-top','');
|
event.body.css('padding-top','');
|
||||||
var hidden = isHidden.call(this,event.div);
|
var hidden = isHidden.call(this,event.div);
|
||||||
if(!hidden)
|
if(!hidden)
|
||||||
@ -593,7 +593,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
|
|||||||
// Bottom hidden is fine
|
// Bottom hidden is fine
|
||||||
if(hidden.hidden === 'top' && !hidden.completely)
|
if(hidden.hidden === 'top' && !hidden.completely)
|
||||||
{
|
{
|
||||||
event.title.css('top',timegrid.scrolling.scrollTop() - event.div.position().top);
|
event.title.css({
|
||||||
|
'top': timegrid.scrolling.scrollTop() - event.div.position().top,
|
||||||
|
'background-color': 'transparent'
|
||||||
|
});
|
||||||
event.body.css('padding-top',timegrid.scrolling.scrollTop() - event.div.position().top);
|
event.body.css('padding-top',timegrid.scrolling.scrollTop() - event.div.position().top);
|
||||||
}
|
}
|
||||||
// Too many in gridlist view, show indicator
|
// Too many in gridlist view, show indicator
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
background: inherit;
|
background: inherit;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_date .calendar_calHoliday a {
|
#calendar-sidebox_date .calendar_calHoliday a {
|
||||||
background-color: #dac0c0;
|
background-color: rgba(103, 159, 210, 0.5);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Toolbar */
|
/* Toolbar */
|
||||||
@ -156,14 +156,13 @@ 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{
|
||||||
background: #dac0c0;
|
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,
|
||||||
* it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off
|
* it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off
|
||||||
*/
|
*/
|
||||||
.calendar_calBirthday,.calendar_calBirthday a{
|
.calendar_calBirthday,.calendar_calBirthday a{
|
||||||
color: #626161;
|
color: #626161;
|
||||||
font-style: italic;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* timeGridWidget, contains timeRow's and dayCol's
|
/* timeGridWidget, contains timeRow's and dayCol's
|
||||||
@ -611,9 +610,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
|
|||||||
white-space: normal;
|
white-space: normal;
|
||||||
background-color: rgba(255,255,255,0.9);
|
background-color: rgba(255,255,255,0.9);
|
||||||
}
|
}
|
||||||
[data-full_day="true"] .calendar_calEventBody {
|
|
||||||
background-color: white;
|
|
||||||
}
|
|
||||||
.calendar_calEventBody > p, .calendar_calEventBodySmall > p {
|
.calendar_calEventBody > p, .calendar_calEventBodySmall > p {
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
@ -671,11 +671,7 @@ 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 {
|
|
||||||
background-color: #679fd2;
|
|
||||||
}
|
|
||||||
.calendar_calHoliday a {
|
.calendar_calHoliday a {
|
||||||
color: #e6e6e6 !important;
|
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
}
|
}
|
||||||
/* 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,
|
||||||
@ -778,10 +774,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
|
|||||||
* border-color: depending on category
|
* border-color: depending on category
|
||||||
* background: depending on category (shade)
|
* background: depending on category (shade)
|
||||||
*/
|
*/
|
||||||
|
background-color: #679fd2;
|
||||||
}
|
}
|
||||||
.calendar_calEvent:hover {
|
.calendar_calEvent:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.calendar_calEvent:not([class*=" cat_"]) {
|
||||||
|
/* Defaults for no category, so we don't override it */
|
||||||
|
background-color: #679fd2;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* All participants accepted the invitation
|
* All participants accepted the invitation
|
||||||
*/
|
*/
|
||||||
@ -1314,9 +1315,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
|
|||||||
#calendar_merge {
|
#calendar_merge {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_date .calendar_calHoliday a {
|
|
||||||
background-color: #679fd2;
|
|
||||||
}
|
|
||||||
#uical_select_owner {
|
#uical_select_owner {
|
||||||
margin: 9px 0 9px;
|
margin: 9px 0 9px;
|
||||||
}
|
}
|
||||||
|
@ -782,9 +782,7 @@ 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{
|
||||||
background-color: @egw_color_2_e;
|
|
||||||
a {
|
a {
|
||||||
color: @gray_10 !important;
|
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -911,11 +909,15 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
|
|||||||
* border-color: depending on category
|
* border-color: depending on category
|
||||||
* background: depending on category (shade)
|
* background: depending on category (shade)
|
||||||
*/
|
*/
|
||||||
|
background-color: @egw_color_blue_lightest;
|
||||||
}
|
}
|
||||||
.calendar_calEvent:hover{
|
.calendar_calEvent:hover{
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.calendar_calEvent:not([class*=" cat_"]) {
|
||||||
|
/* Defaults for no category, so we don't override it */
|
||||||
|
background-color: @egw_color_blue_lightest;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* All participants accepted the invitation
|
* All participants accepted the invitation
|
||||||
*/
|
*/
|
||||||
@ -1349,9 +1351,6 @@ div#calendar-container {
|
|||||||
#calendar_merge{
|
#calendar_merge{
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_date .calendar_calHoliday a {
|
|
||||||
background-color: @egw_color_2_e;
|
|
||||||
}
|
|
||||||
// Owner
|
// Owner
|
||||||
#uical_select_owner {margin: 9px 0 9px;}
|
#uical_select_owner {margin: 9px 0 9px;}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user