Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Calendar: Fix white on white color for itip event preview

Browse source
This commit is contained in:
Aleksander Machniak 2019-06-02 07:44:21 +00:00
parent 98239ee764
commit 6358d0ebfa
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/calendar/calendar_ui.js
View file

@ -3684,8 +3684,7 @@ function rcube_calendar_ui(settings)
if (rcmail.env.itip_events && rcmail.env.itip_events.length) { if (rcmail.env.itip_events && rcmail.env.itip_events.length) {
me.calendars['--invitation--itip'] = { me.calendars['--invitation--itip'] = {
events: rcmail.env.itip_events, events: rcmail.env.itip_events,
color: '#fff', color: 'ffffff',
textColor: '#333',
editable: false, editable: false,
rights: 'lrs', rights: 'lrs',
attendees: true attendees: true

5
plugins/libcalendaring/libcalendaring.js
View file

@ -348,6 +348,11 @@ function rcube_libcalendaring(settings)
if (!color_map[color]) { if (!color_map[color]) {
color_map[color] = '#fff'; 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)) { if (/^#?([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(color)) {
// use information about brightness calculation found at // use information about brightness calculation found at
// http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/ // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/

12
plugins/libkolab/skins/elastic/include/calendar.less
View file

@ -322,16 +322,10 @@ fieldset.categories .input-group {
margin-top: 1.1rem; margin-top: 1.1rem;
} }
&.fc-invitation-needs-action { &.fc-invitation-needs-action,
border: 1px dashed #5757c7; &.fc-invitation-tentative,
}
&.fc-invitation-tentative {
border: 1px dashed #eb8900;
}
&.fc-invitation-declined { &.fc-invitation-declined {
border: 1px dashed #c00; border: 1px dashed #999;
} }
&.fc-event-ns-other.fc-invitation-declined { &.fc-event-ns-other.fc-invitation-declined {