Merge color for spearators and borders

fyreplace · Oct 7, 2024 · ebab2ea · ebab2ea
1 parent 3e649c9
commit ebab2ea
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/src/lib/components/inputs/button/loader.svelte b/src/lib/components/inputs/button/loader.svelte
@@ -27,6 +27,7 @@
 	}
 
 	.dot {
+		fill: currentColor;
 		animation: bounce 0.5s ease-in-out infinite;
 	}
 </style>
diff --git a/src/lib/components/inputs/image-picker.svelte b/src/lib/components/inputs/image-picker.svelte
@@ -14,15 +14,12 @@
 	}
 
 	function onDragOver(event: DragEvent) {
-		event.preventDefault();
-
 		if (event.dataTransfer) {
 			event.dataTransfer.dropEffect = 'copy';
 		}
 	}
 
 	function onDrop(event: DragEvent) {
-		event.preventDefault();
 		const file = event.dataTransfer?.files.item(0);
 
 		if (file) {
@@ -34,8 +31,8 @@
 <label
 	title={t('components.image-picker')}
 	class="image-picker"
-	on:dragover={onDragOver}
-	on:drop={onDrop}
+	on:dragover|preventDefault={onDragOver}
+	on:drop|preventDefault={onDrop}
 >
 	<input
 		type="file"

diff --git a/src/lib/style/_values.scss b/src/lib/style/_values.scss
@@ -4,7 +4,6 @@ $height-regular: 480px;
 $height-expanded: 720px;
 
 :root {
-	--color-separator: gray;
 	--color-border: gray;
 	--color-accent: #ff8243;
 	--color-on-accent: black;

diff --git a/src/routes/navigation.svelte b/src/routes/navigation.svelte
@@ -25,7 +25,7 @@
 			padding-right: 1em;
 			padding-top: max(1em, env(safe-area-inset-top));
 			padding-bottom: max(1em, env(safe-area-inset-bottom));
-			border-inline-end: 2px solid var(--color-separator);
+			border-inline-end: 2px solid var(--color-border);
 
 			@include regular {
 				display: flex;
@@ -41,7 +41,7 @@
 			margin-bottom: env(safe-area-inset-bottom);
 			padding-left: env(safe-area-inset-left);
 			padding-right: env(safe-area-inset-right);
-			border-top: 2px solid var(--color-separator);
+			border-top: 2px solid var(--color-border);
 
 			@include regular {
 				display: none;

diff --git a/src/routes/segments.svelte b/src/routes/segments.svelte
@@ -40,7 +40,7 @@
 		z-index: -1;
 		width: 100%;
 		height: 100%;
-		border: 2px solid var(--color-separator);
+		border: 2px solid var(--color-border);
 		border-radius: 2em;
 		box-sizing: border-box;
 	}

diff --git a/src/routes/top-bar.svelte b/src/routes/top-bar.svelte
@@ -58,7 +58,7 @@
 		padding-right: max(1em, env(safe-area-inset-right));
 		box-sizing: border-box;
 		align-items: center;
-		border-bottom: 2px solid var(--color-separator);
+		border-bottom: 2px solid var(--color-border);
 		transition: 0.3s;
 
 		@include expanded {