Merge branch 'main' into feature/vue3-modals-with-router-4

src/components/misc/subscription.vue

@@ -38,7 +38,9 @@ const props = defineProps({
 	},
 	subscription: {
 		required: true,
-		type: Object as PropType<SubscriptionModel>,
+		validator(value) {
+			return value instanceof SubscriptionModel || value === null
+		}
 	},
 	entityId: {
 		required: true,

src/components/tasks/partials/editLabels.vue

@@ -25,13 +25,13 @@
 		<template #searchResult="props">
 			<span
 				v-if="typeof props.option === 'string'"
-				class="tag">
+				class="tag search-result">
 				<span>{{ props.option }}</span>
 			</span>
 			<span
 				v-else
 				:style="{'background': props.option.hexColor, 'color': props.option.textColor}"
-				class="tag">
+				class="tag search-result">
 				<span>{{ props.option.title }}</span>
 			</span>
 		</template>
@@ -146,6 +146,18 @@ export default {
 
 <style lang="scss" scoped>
 .tag {
-	margin: .5rem 0 0 .5rem;
+	margin: .25rem !important;
+}
+
+.tag.search-result {
+	margin: 0 !important;
+}
+
+:deep(.input-wrapper) {
+	padding: .25rem !important;
+}
+
+:deep(input.input) {
+	padding: 0 .5rem;
 }
 </style>