infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into reminders

pull/1/head
yflory 2021-04-14 15:51:48 +02:00
parent a2d52d7026 dfff667a6e
commit 6fe1aa7877
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/calendar/app-calendar.less
View File

@ -24,6 +24,23 @@
.tui-full-calendar-layout {
background-color: @cp_sidebar-right-bg !important;
color: @cryptpad_text_col;
display: flex;
flex-flow: column;
.tui-full-calendar-week-container {
min-height: 0;
display: flex;
flex-flow: column;
.tui-full-calendar-vlayout-area {
display: flex;
flex-flow: column;
flex: 1;
min-height: 0;
& > div:last-child {
flex: 1;
min-height: 0;
}
}
}
.tui-full-calendar-month {
.tui-full-calendar-weekday-schedule-time .tui-full-calendar-weekday-schedule-title {
color: @cryptpad_text_col !important; // XXX

8
www/calendar/inner.js
View File

@ -757,6 +757,12 @@ Messages.calendar_noNotification = "None";
});
});
$('body').on('keydown', function (e) {
if (e.which === 27) {
$('.tui-full-calendar-floating-layer').hide();
}
});
updateDateRange();
renderCalendar();
@ -971,6 +977,8 @@ Messages.calendar_noNotification = "None";
var privateData = metadataMgr.getPrivateData();
var user = metadataMgr.getUserData();
common.setTabTitle(Messages.calendar);
// Fix flatpickr selection
var MutationObserver = window.MutationObserver;
var onFlatPickr = function (el) {