Skip to content

Commit 112463e

Browse files
Merge branch 'main' into renovate/prettier-3.x
2 parents 88c632f + 7854e35 commit 112463e

2 files changed

Lines changed: 21 additions & 23 deletions

File tree

osmium/src/ui/layout/main-navigation.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export function MainNavigation(_props: MainNavigationProps) {
118118
});
119119

120120
return (
121-
<nav class="custom-scrollbar h-full overflow-y-auto pb-20 md:h-[calc(100vh-7rem)]">
121+
<nav class="custom-scrollbar h-full scrollbar-gutter-stable overflow-y-auto pr-4 pb-20 md:h-[calc(100vh-7rem)]">
122122
<VersionSelector />
123123
<Tabs value={selectedTab()}>
124124
<Tabs.List class="sticky top-0 z-10 grid w-full grid-cols-2 md:bg-slate-50 md:dark:bg-slate-900">
@@ -140,7 +140,7 @@ export function MainNavigation(_props: MainNavigationProps) {
140140
>
141141
Reference
142142
</Tabs.Trigger>
143-
<Tabs.Indicator class="absolute bottom-0 h-0.5 bg-blue-500 transition-all duration-250 dark:bg-blue-500" />
143+
<Tabs.Indicator class="absolute bottom-0 h-0.5 bg-blue-500 transition-all duration-250" />
144144
</Tabs.List>
145145
<Tabs.Content value="learn" class="relative mt-5 w-full">
146146
<Show

osmium/src/ui/layout/version-selector.tsx

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,26 @@ export default function VersionSelector() {
3838
sameWidth
3939
placement="bottom-start"
4040
>
41-
<div class="mx-1">
42-
<Popover.Trigger
43-
class="flex h-10 w-full items-center justify-between rounded-lg text-left shadow-md ring-1 shadow-black/5 ring-black/90 ring-inset dark:ring-white/10"
44-
aria-label="Change version"
45-
disabled={options().length <= 1}
46-
>
47-
<span class="prose prose-slate flex items-center truncate pl-2 text-lg text-slate-700 dark:text-slate-300">
48-
<Icon
49-
class="mr-2 w-5 fill-slate-700 pl-1 dark:fill-slate-200"
50-
path={tag}
51-
/>
52-
{getOptionLabel(current())}
53-
</span>
41+
<Popover.Trigger
42+
class="flex h-10 w-full items-center justify-between rounded-lg text-left shadow-md ring-1 shadow-black/5 ring-black/90 ring-inset dark:ring-white/10"
43+
aria-label="Change version"
44+
disabled={options().length <= 1}
45+
>
46+
<span class="prose prose-slate flex items-center truncate pl-2 text-lg text-slate-700 dark:text-slate-300">
47+
<Icon
48+
class="mr-2 w-5 fill-slate-700 pl-1 dark:fill-slate-200"
49+
path={tag}
50+
/>
51+
{getOptionLabel(current())}
52+
</span>
5453

55-
<Show when={options().length > 1}>
56-
<Icon
57-
class="mr-2 w-6 fill-slate-700 pl-1 dark:fill-slate-200"
58-
path={chevronUpDown}
59-
/>
60-
</Show>
61-
</Popover.Trigger>
62-
</div>
54+
<Show when={options().length > 1}>
55+
<Icon
56+
class="mr-2 w-6 fill-slate-700 pl-1 dark:fill-slate-200"
57+
path={chevronUpDown}
58+
/>
59+
</Show>
60+
</Popover.Trigger>
6361
<Popover.Portal>
6462
<Popover.Content class="z-50 space-y-1 rounded-xl bg-white p-2 text-sm shadow-md ring-1 shadow-black/5 ring-black/5 dark:bg-slate-800 dark:ring-white/5">
6563
<For each={options()}>

0 commit comments

Comments
 (0)