Skip to content

Commit bf65139

Browse files
fix: merge conflict
2 parents 6de6988 + eea12a9 commit bf65139

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

app/components/Package/Skeleton.vue

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22

33
<template>
44
<!-- Package header — matches area-header in [...name].vue -->
5-
<header class="bg-[--bg] pt-5 pb-1 w-full container">
6-
<div class="min-w-0">
7-
<!-- Package name -->
8-
<div class="min-w-0 flex items-center gap-2 justify-between">
9-
<h1 class="font-mono text-2xl sm:text-3xl font-medium">
10-
<SkeletonInline class="block! h-10 w-48" />
11-
</h1>
12-
<div class="flex gap-1">
13-
<!-- Compare placeholder -->
14-
<SkeletonBlock class="w-9 md:w-40 h-10 rounded self-baseline" />
15-
<!-- Likes button placeholder -->
16-
<SkeletonBlock class="w-14 h-10 rounded self-baseline" />
17-
<!-- Fund link placeholder -->
18-
<SkeletonBlock class="w-18 h-10 rounded self-baseline" />
19-
</div>
5+
<header class="bg-bg pt-6 pb-2 pb-1 w-full container">
6+
<!-- Package name -->
7+
<div class="flex items-baseline justify-between gap-x-2 gap-y-1 flex-wrap min-w-0">
8+
<h1 class="font-mono text-2xl sm:text-3xl font-medium">
9+
<SkeletonInline class="block! h-9 w-48" />
10+
</h1>
11+
<div class="flex gap-2 flex-wrap items-stretch">
12+
<!-- Compare placeholder -->
13+
<SkeletonBlock class="w-9 md:w-36 h-9 rounded" />
14+
<!-- Likes button placeholder -->
15+
<SkeletonBlock class="w-14 h-9 rounded" />
16+
<!-- Fund link placeholder -->
17+
<SkeletonBlock class="w-22 h-9 rounded self-baseline" />
2018
</div>
2119
</div>
2220
</header>
2321

24-
<div class="sticky top-14 z-1 pt-3 bg-bg border-b border-border w-full">
22+
<div class="w-full bg-bg sticky top-14 z-10 border-b border-border pt-2">
2523
<div class="w-full container flex flex-col md:flex-row-reverse flex-wrap gap-2 justify-between">
2624
<!-- Version -->
2725
<span class="inline-flex items-baseline font-mono text-base sm:text-lg shrink-0">
@@ -178,7 +176,7 @@
178176
<!-- Sidebar — matches area-sidebar in [...name].vue -->
179177
<div class="area-sidebar">
180178
<div
181-
class="sticky top-30 xl:top-14 space-y-6 sm:space-y-8 min-w-0 overflow-y-auto pe-2.5 lg:(max-h-[calc(100dvh-8.5rem)] overscroll-contain) xl:(max-h-[calc(100dvh-6rem)])"
179+
class="space-y-6 sm:space-y-8 min-w-0 lg:(max-h-[calc(100dvh-8.5rem)] overscroll-contain) xl:(max-h-[calc(100dvh-6rem)])"
182180
>
183181
<div class="flex flex-col gap-4 sm:gap-6 xl:pt-4">
184182
<!-- Download stats — matches CollapsibleSection + sparkline skeleton -->

0 commit comments

Comments
 (0)