Skip to content

Commit 321b653

Browse files
committed
Merge remote-tracking branch 'origin/main' into light-theme
2 parents a739616 + 4e47133 commit 321b653

4 files changed

Lines changed: 16 additions & 14 deletions

File tree

app/components/PackageCard.vue

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,18 @@ const emit = defineEmits<{
4848
<NuxtLink
4949
:to="{ name: 'package', params: { package: result.package.name.split('/') } }"
5050
:prefetch-on="prefetch ? 'visibility' : 'interaction'"
51-
class="focus-visible:outline-none decoration-none scroll-mt-48 scroll-mb-6 after:content-[''] after:absolute after:inset-0"
51+
class="decoration-none scroll-mt-48 scroll-mb-6 after:content-[''] after:absolute after:inset-0"
5252
:data-result-index="index"
5353
@focus="index != null && emit('focus', index)"
5454
@mouseenter="index != null && emit('focus', index)"
55+
>{{ result.package.name }}</NuxtLink
56+
>
57+
<span
58+
v-if="isExactMatch"
59+
class="text-xs px-1.5 py-0.5 ml-2 rounded bg-accent/20 border border-accent/30 text-accent"
60+
>{{ $t('search.exact_match') }}</span
5561
>
56-
{{ result.package.name }}
57-
</NuxtLink>
5862
</component>
59-
<!-- Exact match badge -->
60-
<span
61-
v-if="isExactMatch"
62-
class="shrink-0 text-xs px-1.5 py-0.5 rounded bg-accent/20 border border-accent/30 text-accent font-mono"
63-
>
64-
{{ $t('search.exact_match') }}
65-
</span>
6663
<!-- Mobile: version next to package name -->
6764
<div class="sm:hidden text-fg-subtle flex items-center gap-1.5 shrink-0">
6865
<span
@@ -111,7 +108,7 @@ const emit = defineEmits<{
111108
</dd>
112109
</div>
113110
<div v-if="result.package.license" class="flex items-center gap-1.5">
114-
<dt class="sr-only">License</dt>
111+
<dt class="sr-only">{{ $t('package.card.license') }}</dt>
115112
<dd>{{ result.package.license }}</dd>
116113
</div>
117114
</dl>

app/components/SettingsMenu.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ onKeyStroke(',', e => {
3939
return
4040
}
4141
e.preventDefault()
42-
toggle()
42+
triggerRef.value?.focus()
43+
triggerRef.value?.click()
4344
})
4445
</script>
4546

i18n/locales/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@
116116
"publisher": "Publisher",
117117
"updated": "Updated",
118118
"weekly_downloads": "Weekly downloads",
119-
"keywords": "Keywords"
119+
"keywords": "Keywords",
120+
"license": "License"
120121
},
121122
"versions": {
122123
"title": "Versions",

uno.config.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ export default defineConfig({
121121
['link-subtle', 'text-fg-muted hover:text-fg transition-colors duration-200 focus-ring'],
122122

123123
// Cards
124-
['card', 'bg-bg-subtle border border-border rounded-lg p-4 sm:p-6 transition-all duration-200'],
124+
[
125+
'card',
126+
'bg-bg-subtle border border-border rounded-lg p-4 sm:p-6 transition-[border-color,background-color] duration-200',
127+
],
125128
['card-interactive', 'card hover:(border-border-hover bg-bg-muted) cursor-pointer'],
126129

127130
// Form elements

0 commit comments

Comments
 (0)