dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rrule' of github.com:xwiki-labs/cryptpad into rrule

This commit is contained in:
yflory 2022-09-14 17:42:06 +02:00
parent 2e983bf52a 57e801da98
commit af923170a4
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,13 +134,24 @@
border-color: @cp_calendar-border !important;
}
.tui-full-calendar-popup {
border-radius: @variables_radius_L;
}
.tui-full-calendar-popup-container {
background: @cp_flatpickr-bg;
color: @cryptpad_text_col;
border-radius: @variables_radius;
border-radius: @variables_radius_L;
font-weight: normal;
.tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox) {
display: none;
}
.tui-full-calendar-section-button-save {
height: 40px;
.btn-primary { // Update button
margin-right: 0px;
}
}
}
li.tui-full-calendar-popup-section-item {
padding: 0 6px;
@ -235,14 +246,25 @@
}
}
.cp-recurrence-label, .cp-notif-label {
color: @cryptpad_text_col;
margin-right: 1rem;
i {
margin-right: 0.5rem;
}
}
.cp-calendar-recurrence-container {
margin-top: 1rem;
.cp-calendar-rec-translated-str {
margin-top: 0.5rem;
}
}
.cp-calendar-add-notif {
flex-flow: column;
align-items: baseline !important;
margin: 10px 0;
.cp-notif-label {
color: @cp_sidebar-hint;
margin-right: 20px;
}
margin: 1rem 0;
* {
font-size: @colortheme_app-font-size;
font-weight: normal;
@ -279,7 +301,7 @@
}
.cp-calendar-notif-form {
align-items: center;
margin-bottom: 20px;
// margin-bottom: 20px;
input {
width: 80px;
margin-right: 5px;
@ -288,7 +310,10 @@
}
.cp-calendar-close {
top: 17px;
right: 17px;
height: auto;
margin-right: 0px;
line-height: initial;
border: 1px solid;
&:not(:hover) {

13
www/calendar/inner.js
View File

@ -1840,11 +1840,11 @@ APP.recurrenceRule = {
});
return h('div.cp-calendar-recurrence-container', [
h('hr'),
h('span', Messages.calendar_rec),
h('span.cp-recurrence-label', [
h('i.fa.fa-repeat', {'aria-hidden':'true'}),
Messages.calendar_rec]),
$block[0],
translated,
h('hr')
translated
]);
};
@ -1917,7 +1917,10 @@ APP.recurrenceRule = {
var addNotif = h('button.btn.btn-primary-outline.fa.fa-plus');
var $list = $(h('div.cp-calendar-notif-list'));
var listContainer = h('div.cp-calendar-notif-list-container', [
h('span.cp-notif-label', Messages.calendar_notifications),
h('span.cp-notif-label', [
h('i.fa.fa-bell', {'aria-hidden':'true'}),
Messages.calendar_notifications
]),
$list[0],
h('span.cp-notif-empty', Messages.calendar_noNotification)
]);