Skip to content

Commit ae9b240

Browse files
BYKBYK
authored
Merge branch 'main' into byk/feat/md
2 parents 87226fa + 5db5dc6 commit ae9b240

135 files changed

Lines changed: 3786 additions & 3045 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/assets/main.css‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114

115115
--badge-blue: oklch(0.579 0.191 252);
116116
--badge-yellow: oklch(0.588 0.183 91);
117-
--badge-green: oklch(0.566 0.202 165);
117+
--badge-green: oklch(0.49 0.15 161.08);
118118
--badge-indigo: oklch(0.457 0.24 277.023);
119119
--badge-purple: oklch(0.495 0.172 295);
120120
--badge-orange: oklch(0.67 0.185 55);
@@ -275,13 +275,16 @@ dd {
275275
}
276276

277277
/* Shiki theme colors */
278-
html.light .shiki,
279-
html.light .shiki span {
278+
html.light .shiki {
280279
color: var(--shiki-light) !important;
281280
background-color: var(--shiki-light-bg) !important;
282-
font-style: var(--shiki-light-font-style) !important;
283-
font-weight: var(--shiki-light-font-weight) !important;
284-
text-decoration: var(--shiki-light-text-decoration) !important;
281+
282+
& span {
283+
color: var(--shiki-light) !important;
284+
font-style: var(--shiki-light-font-style) !important;
285+
font-weight: var(--shiki-light-font-weight) !important;
286+
text-decoration: var(--shiki-light-text-decoration) !important;
287+
}
285288
}
286289

287290
/* Inline code in package descriptions */

‎app/components/Alert.vue‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<script setup lang="ts">
2+
interface Props {
3+
variant: 'warning' | 'error'
4+
title?: string
5+
}
6+
7+
defineProps<Props>()
8+
9+
const WRAPPER_CLASSES: Record<Props['variant'], string> = {
10+
warning: 'border-amber-400/20 bg-amber-500/8',
11+
error: 'border-red-400/20 bg-red-500/8',
12+
}
13+
14+
const TITLE_CLASSES: Record<Props['variant'], string> = {
15+
warning: 'text-amber-800 dark:text-amber-300',
16+
error: 'text-red-800 dark:text-red-300',
17+
}
18+
19+
const BODY_CLASSES: Record<Props['variant'], string> = {
20+
warning: 'text-amber-700 dark:text-amber-400',
21+
error: 'text-red-700 dark:text-red-400',
22+
}
23+
24+
const ROLES: Record<Props['variant'], 'status' | 'alert'> = {
25+
warning: 'status',
26+
error: 'alert',
27+
}
28+
</script>
29+
30+
<template>
31+
<div
32+
:role="ROLES[variant]"
33+
class="border rounded-md px-3 py-2.5"
34+
:class="WRAPPER_CLASSES[variant]"
35+
>
36+
<p v-if="title" class="font-semibold mb-1" :class="TITLE_CLASSES[variant]">{{ title }}</p>
37+
<div class="text-xs" :class="BODY_CLASSES[variant]">
38+
<slot />
39+
</div>
40+
</div>
41+
</template>

‎app/components/AppFooter.vue‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,21 @@ const closeModal = () => modalRef.value?.close?.()
8888
</p>
8989
<ul class="mb-8 flex flex-col gap-2">
9090
<li class="flex gap-2 items-center">
91-
<kbd class="kbd">.</kbd>
92-
<span>{{ $t('shortcuts.open_code_view') }}</span>
91+
<kbd class="kbd">m</kbd>
92+
<span>{{ $t('shortcuts.open_main') }}</span>
9393
</li>
9494
<li class="flex gap-2 items-center">
9595
<kbd class="kbd">d</kbd>
9696
<span>{{ $t('shortcuts.open_docs') }}</span>
9797
</li>
98+
<li class="flex gap-2 items-center">
99+
<kbd class="kbd">.</kbd>
100+
<span>{{ $t('shortcuts.open_code_view') }}</span>
101+
</li>
102+
<li class="flex gap-2 items-center">
103+
<kbd class="kbd">f</kbd>
104+
<span>{{ $t('shortcuts.open_diff') }}</span>
105+
</li>
98106
<li class="flex gap-2 items-center">
99107
<kbd class="kbd">c</kbd>
100108
<span>{{ $t('shortcuts.compare_from_package') }}</span>

‎app/components/BuildEnvironment.vue‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script setup lang="ts">
2-
import type { BuildInfo } from '#shared/types'
3-
42
const { footer = false, buildInfo: buildInfoProp } = defineProps<{
53
footer?: boolean
64
buildInfo?: BuildInfo

‎app/components/Code/DirectoryListing.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<script setup lang="ts">
2-
import type { PackageFileTree } from '#shared/types'
32
import type { RouteLocationRaw } from 'vue-router'
43
import type { RouteNamedMap } from 'vue-router/auto-routes'
54
import { ADDITIONAL_ICONS, getFileIcon } from '~/utils/file-icons'

‎app/components/Code/FileTree.vue‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<script setup lang="ts">
2-
import type { PackageFileTree } from '#shared/types'
32
import type { RouteLocationRaw } from 'vue-router'
43
import type { RouteNamedMap } from 'vue-router/auto-routes'
54
import { ADDITIONAL_ICONS, getFileIcon } from '~/utils/file-icons'

‎app/components/Code/MobileTreeDrawer.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<script setup lang="ts">
2-
import type { PackageFileTree } from '#shared/types'
32
import type { RouteNamedMap } from 'vue-router/auto-routes'
43
54
defineProps<{
@@ -29,7 +28,7 @@ watch(isOpen, open => (isLocked.value = open))
2928
<!-- Toggle button (mobile only) -->
3029
<ButtonBase
3130
variant="primary"
32-
class="md:hidden fixed bottom-4 inset-ie-4 z-45"
31+
class="md:hidden fixed bottom-9 inset-ie-4 z-45"
3332
:aria-label="$t('code.toggle_tree')"
3433
@click="isOpen = !isOpen"
3534
:classicon="isOpen ? 'i-lucide:x' : 'i-lucide:folder'"

‎app/components/Compare/FacetBarChart.vue‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<script setup lang="ts">
22
import { ref, computed } from 'vue'
33
import { VueUiHorizontalBar } from 'vue-data-ui/vue-ui-horizontal-bar'
4-
import type {
5-
VueUiHorizontalBarConfig,
6-
VueUiHorizontalBarDatapoint,
7-
VueUiHorizontalBarDatasetItem,
8-
} from 'vue-data-ui'
4+
import type { VueUiHorizontalBarConfig, VueUiHorizontalBarDatasetItem } from 'vue-data-ui'
95
import { getFrameworkColor, isListedFramework } from '~/utils/frameworks'
106
import { drawSmallNpmxLogoAndTaglineWatermark } from '~/composables/useChartWatermark'
117
import {
@@ -230,7 +226,7 @@ const config = computed<VueUiHorizontalBarConfig>(() => {
230226
${name}
231227
</span>
232228
<span class="text-base text-[var(--fg)] font-mono tabular-nums text-end">
233-
${(datapoint as VueUiHorizontalBarDatapoint).formattedValue ?? 0}
229+
${datapoint?.formattedValue ?? 0}
234230
</span>
235231
</div>
236232
</div>

‎app/components/Compare/FacetCard.vue‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script setup lang="ts">
2-
import type { FacetValue } from '#shared/types'
3-
42
const props = defineProps<{
53
/** Facet label */
64
label: string

‎app/components/Compare/FacetRow.vue‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script setup lang="ts">
2-
import type { FacetValue } from '#shared/types'
3-
42
const props = defineProps<{
53
/** Facet label */
64
label: string

0 commit comments

Comments
 (0)