Teil Merge

src/lib/components/Button.svelte

@@ -10,22 +10,6 @@
 	export { classNames as class };
 </script>
 
-{#if href}
-	<a on:click {href} class:w-full={fullWidth} class="button {variant} {size} {classNames} {align}">
-		{@render children()}
-	</a>
-{:else}
-	<button
-		on:click
-		{type}
-		{disabled}
-		class:w-full={fullWidth}
-		class="button {variant} {size} {classNames} {align}"
-	>
-		{@render children()}
-	</button>
-{/if}
-
 {#if href}
 	<a on:click {href} class:w-full={fullWidth} class="button {variant} {size} {classNames} {align}"
 		><slot />

src/routes/(angemeldet)/+page.svelte

@@ -3,12 +3,8 @@
 	import FileRect from '$lib/icons/File-rect.svelte';
 	import ListIcon from '$lib/icons/List-icon.svelte';
 
-<<<<<<< HEAD
-
 	export let data;
 	export let outline = true;
-=======
->>>>>>> temp_f03-Frontend
 </script>
 
 <div
@@ -30,9 +26,7 @@
 					Verschaffe Dir einen Überblick über alle gespeicherten Tatorte.
 				</p>
 			</div>
-<<<<<<< HEAD
+
-=======
->>>>>>> temp_f03-Frontend
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">
 				<div
 					class="flex h-11 w-11 items-center justify-center rounded-lg bg-gray-50 group-hover:bg-white"

src/routes/(token-based)/list/[vorgang]/+page.svelte

@@ -163,7 +163,6 @@
 										}}>{item.name}</span
 									>
 
-
 									{#if item.show_button}
 										<button
 											style="padding: 2px"
@@ -265,11 +264,14 @@
 </div>
 
 {#if data.error}
-	<div class="max-w-xl mx-auto bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative mt-4">
+	<div
+		class="max-w-xl mx-auto bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative mt-4"
+	>
 		<strong class="font-bold">Fehler: </strong>
 		<span class="block sm:inline">{data.error}</span>
 	</div>
 {/if}
+
 <style>
 	ul {
 		min-width: 24rem;