From 5c642a9857e4edcd26e497c120b9e07b23b64a16 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 17 Jun 2023 23:25:47 +0200
Subject: [PATCH] Fix props in calendar feed event bar
---
.../calendar/BaseCalendarFeedEventBar.vue | 21 +++++++++++++++++--
.../frontend/mixins/calendarFeedEventBar.js | 10 ---------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/aleksis/core/frontend/components/calendar/BaseCalendarFeedEventBar.vue b/aleksis/core/frontend/components/calendar/BaseCalendarFeedEventBar.vue
index 87459c564..205cbb13a 100644
--- a/aleksis/core/frontend/components/calendar/BaseCalendarFeedEventBar.vue
+++ b/aleksis/core/frontend/components/calendar/BaseCalendarFeedEventBar.vue
@@ -1,7 +1,7 @@
<template>
<div
- class="mx-1 text-truncate"
- :class="{ 'text-decoration-line-through': event.status === 'CANCELLED' }"
+ class="text-truncate"
+ :class="{ 'text-decoration-line-through': event.status === 'CANCELLED', 'mx-1': withPadding }"
:style="{ height: '100%' }"
>
<slot name="time" v-bind="$props">
@@ -31,5 +31,22 @@ import calendarFeedEventBarMixin from "../../mixins/calendarFeedEventBar.js";
export default {
name: "BaseCalendarFeedEventBar",
mixins: [calendarFeedEventBarMixin],
+ props: {
+ withPadding: {
+ required: false,
+ type: Boolean,
+ default: true,
+ },
+ icon: {
+ required: false,
+ type: String,
+ default: "",
+ },
+ withoutTime: {
+ required: false,
+ type: Boolean,
+ default: false,
+ },
+ }
};
</script>
diff --git a/aleksis/core/frontend/mixins/calendarFeedEventBar.js b/aleksis/core/frontend/mixins/calendarFeedEventBar.js
index 33d4e0c88..3b6590b0f 100644
--- a/aleksis/core/frontend/mixins/calendarFeedEventBar.js
+++ b/aleksis/core/frontend/mixins/calendarFeedEventBar.js
@@ -15,16 +15,6 @@ const calendarFeedEventBarMixin = {
required: true,
type: String,
},
- icon: {
- required: false,
- type: String,
- default: "",
- },
- withoutTime: {
- required: false,
- type: Boolean,
- default: false,
- },
},
};
--
GitLab