From 9722448c3663f01591b911970f3f0bef08eaf0a2 Mon Sep 17 00:00:00 2001
From: Ivan Kuzmenko <6745157+rndtrash@users.noreply.github.com>
Date: Tue, 30 Sep 2025 00:23:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=BB=20HoverIcon,=20=D1=87=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8B=20=D0=B5=D0=B3=D0=BE=20=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=B1=D1=8B=D0=BB=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=20<p>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/components/HoverIcon.svelte       | 30 ++++++++++++++---------
 src/lib/components/NavBar.svelte          |  2 +-
 src/lib/components/SocialButton.svelte    |  2 +-
 src/lib/components/SocialHyperlink.svelte |  4 +--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/lib/components/HoverIcon.svelte b/src/lib/components/HoverIcon.svelte
index 7fbff3c..58d0bc0 100644
--- a/src/lib/components/HoverIcon.svelte
+++ b/src/lib/components/HoverIcon.svelte
@@ -4,29 +4,35 @@
 	let className: string = '';
 	export { className as class };
 	export let src: string | null = null;
-	export let text: string;
+	export let alt: string | undefined = undefined;
 	export let size: number = 32;
 	export let black: boolean = false;
 
-	let isUrl;
-	$: isUrl = src?.startsWith('/') || src?.startsWith('http');
+	function isUrl(src?: string) {
+		return src?.startsWith('/') || src?.startsWith('http');
+	}
 </script>
 
-<div
-	class="{className} {black
-		? 'fill-slate-950'
-		: 'fill-slate-50'} text-sm uppercase transition-all"
->
+<span class="{className} {black ? 'fill-slate-950' : 'fill-slate-50'} hover-icon">
 	{#if src}
-		{#if isUrl}
-			<img {src} alt={text} width={size} height={size} />
+		{#if isUrl(src)}
+			<img {src} {alt} width={size} height={size} />
 		{:else}
 			<Icon width={size} height={size} icon={src} color={black ? '#020618' : '#f8fafc'} />
 		{/if}
 	{:else}
-		{text}
+		{alt ?? 'Без иконки'}
 	{/if}
-</div>
+</span>
 
 <style>
+	@import '$src/app.css';
+
+	.hover-icon {
+		@apply text-sm uppercase transition-all;
+
+		img {
+			margin: 0;
+		}
+	}
 </style>
diff --git a/src/lib/components/NavBar.svelte b/src/lib/components/NavBar.svelte
index 3316ee0..84e5596 100644
--- a/src/lib/components/NavBar.svelte
+++ b/src/lib/components/NavBar.svelte
@@ -20,7 +20,7 @@
 				<HoverIcon
 					src={route.icon}
 					class="text-sm uppercase"
-					text={route.href}
+					alt={route.label}
 					size={32}
 					black={!isActive(route.href)}
 				/>
diff --git a/src/lib/components/SocialButton.svelte b/src/lib/components/SocialButton.svelte
index f12be28..b18df8b 100644
--- a/src/lib/components/SocialButton.svelte
+++ b/src/lib/components/SocialButton.svelte
@@ -14,7 +14,7 @@
 	target={isLinkLocal(href) ? '_self' : '_blank'}
 >
 	<div class="shrink-0 rounded-l-xl bg-slate-800 p-2">
-		<HoverIcon src={customIcon ?? tryGetIcon(href)} class="text-sm uppercase" text={href} />
+		<HoverIcon src={customIcon ?? tryGetIcon(href)} class="text-sm uppercase" />
 	</div>
 	<div
 		class="flex shrink-0 grow flex-nowrap items-center justify-center rounded-r-xl bg-slate-100 p-2 text-2xl text-nowrap text-slate-950"
diff --git a/src/lib/components/SocialHyperlink.svelte b/src/lib/components/SocialHyperlink.svelte
index 27efb4c..c533b5b 100644
--- a/src/lib/components/SocialHyperlink.svelte
+++ b/src/lib/components/SocialHyperlink.svelte
@@ -11,11 +11,11 @@
 	const sm = new MediaQuery('width >= 40rem', false);
 </script>
 
-<a {href} class="{className} group inline-block" target={isLinkLocal(href) ? '_self' : '_blank'}>
+<a {href} class="{className} group inline-block no-underline" target={isLinkLocal(href) ? '_self' : '_blank'}>
 	<span
 		class="inline-block size-6 rounded-sm bg-emerald-800 p-0.5 align-bottom transition-all group-hover:scale-110 sm:size-8 sm:rounded-xl sm:p-1"
 	>
-		<HoverIcon src={customIcon ?? tryGetIcon(href)} text={href} size={sm.current ? 24 : 20} />
+		<HoverIcon src={customIcon ?? tryGetIcon(href)} size={sm.current ? 24 : 20} />
 	</span>
 	<span class="text-emerald-900 underline">
 		<slot />