Calendar: Fix white on white color for itip event preview
This commit is contained in:
parent
98239ee764
commit
6358d0ebfa
3 changed files with 9 additions and 11 deletions
|
@ -3684,8 +3684,7 @@ function rcube_calendar_ui(settings)
|
|||
if (rcmail.env.itip_events && rcmail.env.itip_events.length) {
|
||||
me.calendars['--invitation--itip'] = {
|
||||
events: rcmail.env.itip_events,
|
||||
color: '#fff',
|
||||
textColor: '#333',
|
||||
color: 'ffffff',
|
||||
editable: false,
|
||||
rights: 'lrs',
|
||||
attendees: true
|
||||
|
|
|
@ -348,6 +348,11 @@ function rcube_libcalendaring(settings)
|
|||
if (!color_map[color]) {
|
||||
color_map[color] = '#fff';
|
||||
|
||||
// Convert 3-char to 6-char
|
||||
if (/^#?([a-f0-9]{1})([a-f0-9]{1})([a-f0-9]{1})$/i.test(color)) {
|
||||
color = '#' + RegExp.$1 + RegExp.$1 + RegExp.$2 + RegExp.$2 + RegExp.$3 + RegExp.$3;
|
||||
}
|
||||
|
||||
if (/^#?([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(color)) {
|
||||
// use information about brightness calculation found at
|
||||
// http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
|
||||
|
|
|
@ -322,16 +322,10 @@ fieldset.categories .input-group {
|
|||
margin-top: 1.1rem;
|
||||
}
|
||||
|
||||
&.fc-invitation-needs-action {
|
||||
border: 1px dashed #5757c7;
|
||||
}
|
||||
|
||||
&.fc-invitation-tentative {
|
||||
border: 1px dashed #eb8900;
|
||||
}
|
||||
|
||||
&.fc-invitation-needs-action,
|
||||
&.fc-invitation-tentative,
|
||||
&.fc-invitation-declined {
|
||||
border: 1px dashed #c00;
|
||||
border: 1px dashed #999;
|
||||
}
|
||||
|
||||
&.fc-event-ns-other.fc-invitation-declined {
|
||||
|
|
Loading…
Add table
Reference in a new issue