Skip to content

Commit 7c49d5b

Browse files
authored
Merge branch 'main' into baguette
2 parents a94a283 + 7871908 commit 7c49d5b

12 files changed

Lines changed: 119 additions & 117 deletions

app/components/PackagePlaygrounds.vue

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ const props = defineProps<{
77
88
// Map provider id to icon class
99
const providerIcons: Record<string, string> = {
10-
'stackblitz': 'i-simple-icons-stackblitz',
11-
'codesandbox': 'i-simple-icons-codesandbox',
12-
'codepen': 'i-simple-icons-codepen',
13-
'replit': 'i-simple-icons-replit',
14-
'gitpod': 'i-simple-icons-gitpod',
15-
'vue-playground': 'i-simple-icons-vuedotjs',
16-
'nuxt-new': 'i-simple-icons-nuxtdotjs',
17-
'vite-new': 'i-simple-icons-vite',
18-
'jsfiddle': 'i-carbon-code',
10+
'stackblitz': 'i-simple-icons:stackblitz',
11+
'codesandbox': 'i-simple-icons:codesandbox',
12+
'codepen': 'i-simple-icons:codepen',
13+
'replit': 'i-simple-icons:replit',
14+
'gitpod': 'i-simple-icons:gitpod',
15+
'vue-playground': 'i-simple-icons:vuedotjs',
16+
'nuxt-new': 'i-simple-icons:nuxtdotjs',
17+
'vite-new': 'i-simple-icons:vite',
18+
'jsfiddle': 'i-carbon:code',
1919
}
2020
2121
// Map provider id to color class
@@ -32,7 +32,7 @@ const providerColors: Record<string, string> = {
3232
}
3333
3434
function getIcon(provider: string): string {
35-
return providerIcons[provider] || 'i-carbon-play'
35+
return providerIcons[provider] || 'i-carbon:play'
3636
}
3737
3838
function getColor(provider: string): string {
@@ -141,13 +141,13 @@ function focusMenuItem(index: number) {
141141
@keydown="handleKeydown"
142142
>
143143
<span class="flex items-center gap-2">
144-
<span class="i-carbon-play w-4 h-4 shrink-0 text-fg-muted" aria-hidden="true" />
144+
<span class="i-carbon:play w-4 h-4 shrink-0 text-fg-muted" aria-hidden="true" />
145145
<span class="text-fg-muted"
146146
>{{ $t('package.playgrounds.choose') }} ({{ links.length }})</span
147147
>
148148
</span>
149149
<span
150-
class="i-carbon-chevron-down w-3 h-3 text-fg-subtle transition-transform duration-200 motion-reduce:transition-none"
150+
class="i-carbon:chevron-down w-3 h-3 text-fg-subtle transition-transform duration-200 motion-reduce:transition-none"
151151
:class="{ 'rotate-180': isOpen }"
152152
aria-hidden="true"
153153
/>
@@ -166,7 +166,7 @@ function focusMenuItem(index: number) {
166166
v-if="isOpen && hasMultipleLinks"
167167
ref="menuRef"
168168
role="menu"
169-
class="absolute top-full left-0 right-0 mt-1 bg-bg-elevated border border-border rounded-lg shadow-lg z-50 py-1 overflow-visible"
169+
class="absolute top-full inset-is-0 inset-ie-0 mt-1 bg-bg-elevated border border-border rounded-lg shadow-lg z-50 py-1 overflow-visible"
170170
@keydown="handleKeydown"
171171
>
172172
<AppTooltip v-for="link in links" :key="link.url" :text="link.providerName" class="block">

app/components/PackageSkeleton.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@
110110
</h2>
111111
<!-- code-block with relative positioning for copy button -->
112112
<div class="relative">
113-
<div class="code-block pr-16">
113+
<div class="code-block pe-16">
114114
<span class="skeleton inline-block h-5 w-52" />
115115
</div>
116-
<span class="skeleton absolute top-3 right-3 h-6 w-12 rounded" />
116+
<span class="skeleton absolute top-3 inset-ie-3 h-6 w-12 rounded" />
117117
</div>
118118
</section>
119119

app/components/PackageVulnerabilityTree.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ const summaryText = computed(() => {
3939
// Styling for each depth level - using accessible colors for both themes
4040
const depthStyles = {
4141
root: {
42-
bg: 'bg-amber-500/5 border-l-2 border-l-amber-600',
42+
bg: 'bg-amber-500/5 border-is-2 border-is-amber-600',
4343
text: 'text-fg',
4444
},
4545
direct: {
46-
bg: 'bg-amber-500/5 border-l-2 border-l-amber-500',
46+
bg: 'bg-amber-500/5 border-is-2 border-is-amber-500',
4747
text: 'text-fg-muted',
4848
},
4949
transitive: {
50-
bg: 'bg-amber-500/5 border-l-2 border-l-amber-400',
50+
bg: 'bg-amber-500/5 border-is-2 border-is-amber-400',
5151
text: 'text-fg-muted',
5252
},
5353
} as const
@@ -72,13 +72,13 @@ function getDepthStyle(depth: string | undefined) {
7272
<!-- Header -->
7373
<button
7474
type="button"
75-
class="w-full flex items-center justify-between gap-3 px-4 py-3 text-left transition-colors duration-200 hover:bg-white/5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-fg/50"
75+
class="w-full flex items-center justify-between gap-3 px-4 py-3 text-start transition-colors duration-200 hover:bg-white/5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-fg/50"
7676
:aria-expanded="isExpanded"
7777
aria-controls="vuln-tree-details"
7878
@click="isExpanded = !isExpanded"
7979
>
8080
<div class="flex items-center gap-2 min-w-0">
81-
<span class="i-carbon-warning-alt w-4 h-4 shrink-0" aria-hidden="true" />
81+
<span class="i-carbon:warning-alt w-4 h-4 shrink-0" aria-hidden="true" />
8282
<span class="font-mono text-sm font-medium truncate">
8383
{{
8484
$t(
@@ -96,7 +96,7 @@ function getDepthStyle(depth: string | undefined) {
9696
<div class="flex items-center gap-2 shrink-0">
9797
<span class="text-xs opacity-80 hidden sm:inline">{{ summaryText }}</span>
9898
<span
99-
class="i-carbon-chevron-down w-4 h-4 transition-transform duration-200"
99+
class="i-carbon:chevron-down w-4 h-4 transition-transform duration-200"
100100
:class="{ 'rotate-180': isExpanded }"
101101
aria-hidden="true"
102102
/>
@@ -181,7 +181,7 @@ function getDepthStyle(depth: string | undefined) {
181181
v-if="vulnTree!.failedQueries"
182182
class="px-4 py-2 text-xs text-fg-subtle border-t border-border flex items-center gap-2"
183183
>
184-
<span class="i-carbon-warning w-3 h-3" aria-hidden="true" />
184+
<span class="i-carbon:warning w-3 h-3" aria-hidden="true" />
185185
<span>{{ $t('package.vulnerabilities.packages_failed', vulnTree!.failedQueries) }}</span>
186186
</div>
187187
</div>
@@ -196,7 +196,7 @@ function getDepthStyle(depth: string | undefined) {
196196
<section v-else-if="status === 'error'" aria-labelledby="vuln-tree-error">
197197
<div class="rounded-lg border border-border bg-bg-subtle px-4 py-3">
198198
<div class="flex items-center gap-2">
199-
<span class="i-carbon-warning w-4 h-4 text-fg-subtle" aria-hidden="true" />
199+
<span class="i-carbon:warning w-4 h-4 text-fg-subtle" aria-hidden="true" />
200200
<span class="text-sm text-fg-muted">
201201
{{ $t('package.vulnerabilities.scan_failed') }}
202202
</span>

app/components/PackageWeeklyDownloadStats.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,18 @@ const config = computed(() => {
178178
>
179179
{{ $t('package.downloads.title') }}
180180
<span
181-
class="i-carbon-link w-3 h-3 block opacity-0 group-hover:opacity-100 transition-opacity duration-200"
181+
class="i-carbon:link w-3 h-3 block opacity-0 group-hover:opacity-100 transition-opacity duration-200"
182182
aria-hidden="true"
183183
/>
184184
</a>
185185
</h2>
186186
<button
187187
type="button"
188188
@click="showModal = true"
189-
class="link-subtle font-mono text-sm inline-flex items-center gap-1.5 ml-auto shrink-0 self-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-fg/50 rounded"
189+
class="link-subtle font-mono text-sm inline-flex items-center gap-1.5 ms-auto shrink-0 self-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-fg/50 rounded"
190190
:title="$t('package.downloads.analyze')"
191191
>
192-
<span class="i-carbon-data-analytics w-4 h-4" aria-hidden="true" />
192+
<span class="i-carbon:data-analytics w-4 h-4" aria-hidden="true" />
193193
<span class="sr-only">{{ $t('package.downloads.analyze') }}</span>
194194
</button>
195195
</div>
@@ -201,17 +201,17 @@ const config = computed(() => {
201201
<!-- Skeleton matching sparkline layout: title row + chart with data label -->
202202
<div class="min-h-[100px]">
203203
<!-- Title row: date range (24px height) -->
204-
<div class="h-6 flex items-center pl-3">
204+
<div class="h-6 flex items-center ps-3">
205205
<span class="skeleton h-3 w-36" />
206206
</div>
207207
<!-- Chart area: data label left, sparkline right -->
208208
<div class="aspect-[500/80] flex items-center">
209209
<!-- Data label (covers ~42% width) -->
210-
<div class="w-[42%] flex items-center pl-0.5">
210+
<div class="w-[42%] flex items-center ps-0.5">
211211
<span class="skeleton h-7 w-24" />
212212
</div>
213213
<!-- Sparkline area (~58% width) -->
214-
<div class="flex-1 flex items-end gap-0.5 h-4/5 pr-3">
214+
<div class="flex-1 flex items-end gap-0.5 h-4/5 pe-3">
215215
<span
216216
v-for="i in 16"
217217
:key="i"
@@ -245,7 +245,7 @@ const config = computed(() => {
245245
class="w-12 h-12 bg-bg-elevated border border-border rounded-full shadow-lg flex items-center justify-center text-fg-muted hover:text-fg transition-colors"
246246
:aria-label="$t('common.close')"
247247
>
248-
<span class="w-5 h-5 i-carbon-close" aria-hidden="true" />
248+
<span class="w-5 h-5 i-carbon:close" aria-hidden="true" />
249249
</button>
250250
</div>
251251
</template>

app/components/UserCombobox.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ const prefersReducedMotion = useMediaQuery('(prefers-reduced-motion: reduce)')
205205
aria-live="polite"
206206
>
207207
<span
208-
class="i-carbon-information w-3 h-3 inline-block mr-1 align-middle"
208+
class="i-carbon:information w-3 h-3 inline-block me-1 align-middle"
209209
aria-hidden="true"
210210
/>
211211
{{

app/components/VersionSelector.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ watch(
485485
latest
486486
</span>
487487
<span
488-
class="i-carbon-chevron-down w-3.5 h-3.5 transition-[transform] duration-200 motion-reduce:transition-none"
488+
class="i-carbon:chevron-down w-3.5 h-3.5 transition-[transform] duration-200 motion-reduce:transition-none"
489489
:class="{ 'rotate-180': isOpen }"
490490
aria-hidden="true"
491491
/>
@@ -507,7 +507,7 @@ watch(
507507
:aria-activedescendant="
508508
focusedIndex >= 0 ? `version-${flatItems[focusedIndex]?.version?.version}` : undefined
509509
"
510-
class="absolute top-full left-0 mt-2 min-w-[220px] bg-bg-elevated border border-border rounded-lg shadow-lg z-50 py-1 max-h-[400px] overflow-y-auto overscroll-contain focus-visible:outline-none"
510+
class="absolute top-full inset-is-0 mt-2 min-w-[220px] bg-bg-elevated border border-border rounded-lg shadow-lg z-50 py-1 max-h-[400px] overflow-y-auto overscroll-contain focus-visible:outline-none"
511511
@keydown="handleListboxKeydown"
512512
>
513513
<!-- Version groups -->
@@ -541,13 +541,13 @@ watch(
541541
>
542542
<span
543543
v-if="group.isLoading"
544-
class="i-carbon-rotate-180 w-3 h-3 motion-safe:animate-spin"
544+
class="i-carbon:rotate-180 w-3 h-3 motion-safe:animate-spin"
545545
aria-hidden="true"
546546
/>
547547
<span
548548
v-else
549-
class="w-3 h-3 transition-transform duration-200"
550-
:class="group.isExpanded ? 'i-carbon-chevron-down' : 'i-carbon-chevron-right'"
549+
class="w-3 h-3 transition-transform duration-200 rtl-flip"
550+
:class="group.isExpanded ? 'i:carbon:chevron-down' : 'i-carbon:chevron-right'"
551551
aria-hidden="true"
552552
/>
553553
</button>
@@ -582,7 +582,7 @@ watch(
582582
<!-- Expanded versions -->
583583
<div
584584
v-if="group.isExpanded && group.versions.length > 1"
585-
class="ml-6 border-l border-border"
585+
class="ms-6 border-is border-border"
586586
>
587587
<template v-for="(v, vIndex) in group.versions.slice(1)" :key="v.version">
588588
<NuxtLink
@@ -595,7 +595,7 @@ watch(
595595
flatItems[focusedIndex]?.type === 'version' &&
596596
flatItems[focusedIndex]?.version?.version === v.version
597597
"
598-
class="flex items-center justify-between gap-2 pl-4 pr-3 py-1.5 text-xs font-mono hover:bg-bg-muted transition-[color,background-color] focus-visible:outline-none"
598+
class="flex items-center justify-between gap-2 ps-4 pe-3 py-1.5 text-xs font-mono hover:bg-bg-muted transition-[color,background-color] focus-visible:outline-none"
599599
:class="[
600600
v.isCurrent ? 'text-fg bg-bg-muted' : 'text-fg-subtle',
601601
flatItems[focusedIndex]?.version?.version === v.version ? 'bg-bg-muted' : '',

0 commit comments

Comments
 (0)