Skip to content

Commit 4bde8e8

Browse files
authored
Merge branch 'main' into pr-tabs-final-selectedIndex-attempt
2 parents 1e09d5b + 8f09ebc commit 4bde8e8

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

apps/website/src/components/header/header.tsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default component$(
2727
({ showVersion = false, showBottomBorder = false }: HeaderProps) => {
2828
const location = useLocation();
2929
const appState = useContext(APP_STATE_CONTEXT_ID);
30+
3031
const menuOpenSignal = useSignal(false);
3132

3233
const kitSignal = useComputed$(() => {
@@ -61,18 +62,13 @@ export default component$(
6162
: ``,
6263
]}
6364
>
64-
<button
65-
type="button"
66-
aria-label="Toggle navigation"
67-
onClick$={toggleMenu$}
68-
class="block lg:hidden"
69-
>
70-
{menuOpenSignal.value ? <CloseIcon /> : <MenuIcon />}
71-
</button>
7265
{menuOpenSignal.value && (
73-
<aside class="fixed top-0 left-0">
74-
<div class="fixed h-screen w-screen bg-gray-900/20 backdrop-blur-sm"></div>
75-
<div class="fixed h-screen w-80 overflow-y-scroll bg-white">
66+
<aside class="fixed top-20 left-0 lg:hidden">
67+
<div
68+
onClick$={toggleMenu$}
69+
class="fixed h-screen w-screen bg-gray-900/20 backdrop-blur-sm"
70+
></div>
71+
<div class="fixed h-screen w-screen sm:w-80 overflow-y-scroll bg-white dark:bg-[var(--color-bg)]">
7672
<Menu onClose$={toggleMenu$} />
7773
</div>
7874
</aside>
@@ -114,6 +110,14 @@ export default component$(
114110
>
115111
<GitHubIcon />
116112
</a>
113+
<button
114+
type="button"
115+
aria-label="Toggle navigation"
116+
onClick$={toggleMenu$}
117+
class="block lg:hidden"
118+
>
119+
{menuOpenSignal.value ? <CloseIcon /> : <MenuIcon />}
120+
</button>
117121
</header>
118122
);
119123
}

apps/website/src/components/kit-selection-cta/kit-selection-cta.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default component$(({ kit }: Kit) => {
1111
hover:-outline-offset-4 hover:outline-4 hover:outline hover:outline-[var(--qwik-light-blue)] hover:scale-[1.025]
1212
focus:-outline-offset-4 focus:outline-4 focus:outline focus:outline-[var(--qwik-light-blue)] focus:scale-[1.025] duration-150"
1313
>
14-
<Card class={`max-w-md`}>
14+
<Card>
1515
<CardImage
1616
src={`/images/kit-cta-${kit}.png`}
1717
alt={`${kit} kit`}

apps/website/src/components/menu/menu.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ export const Menu = component$<Props>(({ onClose$ }) => {
113113
});
114114

115115
return (
116-
<div class="px-4 py-4">
116+
<div class="px-4 py-4 ">
117117
<div class="flex items-center justify-between">
118118
<h4 class="text-2xl">Documentation</h4>
119-
{onClose$ && (
119+
{/* {onClose$ && (
120120
// eslint-disable-next-line qwik/valid-lexical-scope
121121
<h5 onClick$={onClose$}>
122122
<CloseIcon />
123123
</h5>
124-
)}
124+
)} */}
125125
</div>
126126
<div class="mt-4">
127127
<div class="mt-8 flex items-center">

0 commit comments

Comments
 (0)