extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more style changes:

Browse Source 
- 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:
Nathan Gray 2016-01-21 18:37:31 +00:00
parent 80ce556003
commit 01471c3d61
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_daycol.js
View File

@ -582,7 +582,7 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
}
// Reset
event.title.css('top','');
event.title.css({'top':'','background-color':''});
event.body.css('padding-top','');
var hidden = isHidden.call(this,event.div);
if(!hidden)
@ -593,7 +593,10 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
// Bottom hidden is fine
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);
}
// Too many in gridlist view, show indicator

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

@ -46,7 +46,7 @@
background: inherit;
}
#calendar-sidebox_date .calendar_calHoliday a {
background-color: #dac0c0;
background-color: rgba(103, 159, 210, 0.5);
}
/* 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
*/
.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,
* it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off
*/
.calendar_calBirthday,.calendar_calBirthday a{
color: #626161;
font-style: italic;
}
/* 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;
background-color: rgba(255,255,255,0.9);
}
[data-full_day="true"] .calendar_calEventBody {
background-color: white;
}
.calendar_calEventBody > p, .calendar_calEventBodySmall > p {
white-space: pre-wrap;
}

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

@ -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
*/
.calendar_calHoliday {
background-color: #679fd2;
}
.calendar_calHoliday a {
color: #e6e6e6 !important;
font-size: 0.9em;
}
/* 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
* background: depending on category (shade)
*/
background-color: #679fd2;
}
.calendar_calEvent:hover {
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
*/
@ -1314,9 +1315,6 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
#calendar_merge {
font-size: 11px;
}
#calendar-sidebox_date .calendar_calHoliday a {
background-color: #679fd2;
}
#uical_select_owner {
margin: 9px 0 9px;
}

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

@ -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
*/
.calendar_calHoliday{
background-color: @egw_color_2_e;
a {
color: @gray_10 !important;
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
* background: depending on category (shade)
*/
background-color: @egw_color_blue_lightest;
}
.calendar_calEvent:hover{
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
*/
@ -1349,9 +1351,6 @@ div#calendar-container {
#calendar_merge{
font-size: 11px;
}
#calendar-sidebox_date .calendar_calHoliday a {
background-color: @egw_color_2_e;
}
// Owner
#uical_select_owner {margin: 9px 0 9px;}