Release 2.0.28 (#4172)

See https://github.com/kimai/kimai/pull/4172
2023-07-09 15:27:27 +02:00
parent 651f812da8
commit 385753fbc3
27 changed files with 182 additions and 53 deletions
--- a/assets/js/widgets/KimaiCalendar.js
+++ b/assets/js/widgets/KimaiCalendar.js
@@ -606,7 +606,7 @@ export default class KimaiCalendar {
                    <li>` + this.options['translations']['activity'] + `: ` + escaper.escapeForHtml(eventObj.activity) + `</li>
                </ul>` +
                (eventObj.description !== null || eventObj.tags.length > 0 ? '<hr>' : '') +
-                (eventObj.description ? '<p>' + escaper.escapeForHtml(eventObj.description) + '</p>' : '') + tags + `
+                (eventObj.description ? '<div>' + escaper.escapeForHtml(eventObj.description) + '</div>' : '') + tags + `
            </div>`;
    }

--- a/assets/sass/calendar.scss
+++ b/assets/sass/calendar.scss
@@ -3,6 +3,9 @@
        padding: 0;
        list-style-type: none;
    }
+    div {
+        white-space: pre-line;
+    }
 }

 .draggable {