Skip to content

Commit 3ab37ff

Browse files
authored
Merge pull request #1744 from mercihabam/calendar-fixes
fix(frontend): event description floating out of page on long texts and delete event button incorrectly triggered
2 parents 83d46d8 + da469dc commit 3ab37ff

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

modules/calendar/js_modules/route_handlers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function applyCalendarPageHandlers() {
2-
$('.event_delete').on("click", function() {
2+
$('.event_delete a').on("click", function() {
33
if (hm_delete_prompt()) {
4-
$(this).parent().submit();
4+
$(this).closest('form').submit();
55
}
66
});
77
$('.cal_title').on("click", function(e) {

modules/calendar/site.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
.calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
55
.event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
66
.event_details td { padding: 5px; border: none; height: auto; }
7+
.event_detail {
8+
max-height: 35vh;
9+
overflow: auto;
10+
}

0 commit comments

Comments
 (0)