The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1094-calendar-event-edit-panel-cuts-off' into staging

Browse Source
This commit is contained in:
yflory 2023-10-02 15:15:18 +02:00
commit 4dfbf1175e
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -1,3 +1,4 @@
{
"name": "cryptpad",
"version": "5.4.1",

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

@ -124,7 +124,10 @@
justify-content: center !important;
align-items: center !important;
.tui-full-calendar-popup {
width: 540px !important;
width: 540px;
max-width: 100%;
max-height: 100%;
overflow-y: auto;
}
}
#tui-full-calendar-popup-arrow {
@ -149,6 +152,7 @@
border-radius: @variables_radius_L;
}
.tui-full-calendar-popup-container {
min-width: 100%;
background: @cp_flatpickr-bg;
color: @cryptpad_text_col;
border-radius: @variables_radius_L;
@ -197,6 +201,7 @@
overflow: hidden;
text-overflow: ellipsis;
font: @colortheme_app-font;
padding: 0 10px;
}
input { flex: 1; }
}
@ -299,6 +304,7 @@
display: flex;
}
.cp-calendar-notif-list-container {
width: 100%;
margin-bottom: 10px;
.cp-notif-label {
margin-top: 0.5em;
@ -307,25 +313,34 @@
.cp-calendar-notif-list {
display: flex;
flex-flow: column;
flex: 1;
min-width: 150px;
.cp-notif-entry {
display: flex;
margin-bottom: 2px;
border-radius: @variables_radius;
background-color: fade(@cryptpad_text_col, 10%);
padding: 0.25rem;
.cp-notif-value {
width: 170px;
width: 75%;
display: inline-flex;
line-height: 30px;
vertical-align: middle;
flex-grow: 1;
.cp-before {
flex: 1;
min-width: 0;
}
}
span:not(:last-child) {
margin: 0px 5px;
margin: 0;
margin-right: 0.3rem;
}
span:first-child {
margin-left: 0.3rem;
}
.btn-danger-outline {
display: block;
margin-right: 0px !important;
background-color: transparent;
color: @cryptpad_text_col;
@ -351,6 +366,13 @@
}
.cp-calendar-notif-form {
align-items: center;
.cp-calendar-notif-form-buttons {
display: inline-flex;
align-items: center;
& > input {
height: 40px;
}
}
// margin-bottom: 20px;
input {
width: 80px;
@ -642,6 +664,10 @@
}
@media (max-width: @browser_media-medium-screen) {
.cp-calendar-notif-list-container, .cp-calendar-notif-form {
flex-direction: column;
align-items: unset !important;
}
.cp-calendar-newevent {
i {
margin: 0 !important;

12
www/calendar/inner.js
View File

@ -1922,7 +1922,9 @@ APP.recurrenceRule = {
};
$(addNotif).click(function () {
var unit = $block.getValue();
var value = $number.val();
var val = $number.val();
if (val === "") { return void UI.warn(Messages.error); }
var value = Number(val);
addNotification(unit, value);
});
oldReminders.forEach(function (minutes) {
@ -1933,9 +1935,11 @@ APP.recurrenceRule = {
listContainer,
h('div.cp-calendar-notif-form', [
h('span.cp-notif-label', Messages.calendar_addNotification),
number,
$block[0],
addNotif
h('span.cp-calendar-notif-form-buttons', [
number,
$block[0],
addNotif
])
])
]);
};