Skip to content

Commit d7f82f8

Browse files
committed
fixed scrollbar showing on x-axis alongside the login button showing twice on smaller screens
1 parent 7530fd1 commit d7f82f8

File tree

4 files changed

+92
-86
lines changed

4 files changed

+92
-86
lines changed

components/Nav.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Nav = () => {
99
const { data, status } = useSession();
1010
const [isOpen, setIsOpen] = useState(false);
1111
return (
12-
<nav className='sticky top-0 mb-20 bg-white/70 dark:bg-black/70 backdrop-blur-md z-50 shadow-sm'>
12+
<nav className='sticky top-0 z-50 mb-20 bg-white/70 shadow-sm backdrop-blur-md dark:bg-black/70'>
1313
<div className='flex items-center justify-between px-5'>
1414
<div>
1515
<Logo />
@@ -19,13 +19,15 @@ const Nav = () => {
1919
<MenuRoot isOpen={isOpen} setIsOpen={setIsOpen}>
2020
<MenuTrigger>
2121
<div>
22-
<Menu className='inline-block p-1 my-4' size={30} />
22+
<Menu className='my-4 inline-block p-1' size={30} />
2323
</div>
2424
<MenuContent isOpen={isOpen}>
2525
<MenuItem link='/hyperdocs/docs'>Docs</MenuItem>
2626
<MenuItem link='/hyperdocs/showcase'>Showcase</MenuItem>
2727
<MenuItem link='/hyperdocs/blog'>Blog</MenuItem>
28-
<MenuItem link='/login'>Login</MenuItem>
28+
<MenuItem className='hidden md:block' link='/login'>
29+
Login
30+
</MenuItem>
2931
{status === 'unauthenticated' || status === 'loading' ? (
3032
<MenuItem link='/login'>Login</MenuItem>
3133
) : (
@@ -35,7 +37,7 @@ const Nav = () => {
3537
</MenuTrigger>
3638
</MenuRoot>
3739
</div>
38-
<ul className='space-x-10 py-5 hidden md:block'>
40+
<ul className='hidden space-x-10 py-7 md:block'>
3941
<Link href='/hyperdocs/docs'>
4042
<a className='opacity-60 transition-all hover:opacity-100'>
4143
Docs

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
"lodash.truncate": "^4.4.2",
3232
"markdown-toc": "^1.2.0",
3333
"mdx-bundler": "^8.0.1",
34-
"next": "12.0.10",
34+
"next": "^12.1.0",
3535
"next-auth": "^4.1.2",
3636
"next-seo": "^5.1.0",
3737
"next-themes": "^0.0.15",
3838
"octokit": "^1.7.1",
39-
"react": "17.0.2",
40-
"react-dom": "17.0.2",
39+
"react": "^17.0.2",
40+
"react-dom": "^17.0.2",
4141
"react-feather": "^2.0.9",
4242
"react-hook-form": "^7.26.0",
4343
"react-hot-toast": "^2.2.0",

styles/globals.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ html {
2222
Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
2323
}
2424

25+
body {
26+
overflow-x: hidden;
27+
}
28+
2529
* {
2630
box-sizing: border-box;
2731
}
@@ -67,7 +71,7 @@ html {
6771
}
6872

6973
.anchor .icon-link {
70-
@apply absolute invisible;
74+
@apply invisible absolute;
7175
margin-left: -1em;
7276
padding-right: 0.5em;
7377
width: 80%;
@@ -91,9 +95,9 @@ html {
9195
.mdx-content ul > code,
9296
.mdx-content ol > code,
9397
.mdx-content li > code {
94-
@apply px-1 py-px rounded bg-slate-200 dark:bg-slate-700;
98+
@apply rounded bg-slate-200 px-1 py-px dark:bg-slate-700;
9599
}
96100

97101
hr {
98-
@apply border-b-2 border-slate-300 dark:border-slate-600 rounded-full;
102+
@apply rounded-full border-b-2 border-slate-300 dark:border-slate-600;
99103
}

yarn.lock

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,10 @@
509509
resolved "https://registry.yarnpkg.com/@next-auth/prisma-adapter/-/prisma-adapter-1.0.1.tgz#63a55d0c28bbb1f1db1e7823d2fd14eb2856e260"
510510
integrity sha512-oZ1yDs5pSz19JvyYkIuf52CHpCc79ND/VYl3sX8Cwy3TaTfGgZWHRJfdcj3ordFNKIPxlV2qBYIX2UjgmSyTqQ==
511511

512-
"@next/env@12.0.10":
513-
version "12.0.10"
514-
resolved "https://registry.yarnpkg.com/@next/env/-/env-12.0.10.tgz#561640fd62279218ccd2798ae907bae8d94a7730"
515-
integrity sha512-mQVj0K6wQ5WEk/sL9SZ+mJXJUaG7el8CpZ6io1uFe9GgNTSC7EgUyNGqM6IQovIFc5ukF4O/hqsdh3S/DCgT2g==
512+
"@next/env@12.1.0":
513+
version "12.1.0"
514+
resolved "https://registry.yarnpkg.com/@next/env/-/env-12.1.0.tgz#73713399399b34aa5a01771fb73272b55b22c314"
515+
integrity sha512-nrIgY6t17FQ9xxwH3jj0a6EOiQ/WDHUos35Hghtr+SWN/ntHIQ7UpuvSi0vaLzZVHQWaDupKI+liO5vANcDeTQ==
516516

517517
518518
version "12.0.10"
@@ -521,60 +521,60 @@
521521
dependencies:
522522
glob "7.1.7"
523523

524-
"@next/swc-android-arm64@12.0.10":
525-
version "12.0.10"
526-
resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.0.10.tgz#fd9d716433cc9d361021b0052f8b002bcaff948d"
527-
integrity sha512-xYwXGkNhzZZsM5MD7KRwF5ZNiC8OLPtVMUiagpPnwENg8Hb0GSQo/NbYWXM8YrawEwp9LaZ7OXiuRKPh2JyBdA==
528-
529-
"@next/swc-darwin-arm64@12.0.10":
530-
version "12.0.10"
531-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.0.10.tgz#34b2d0dc62eb89efb9176af111e3820a11fdb3f0"
532-
integrity sha512-f2zngulkpIJKWHckhRi7X8GZ+J/tNgFF7lYIh7Qx15JH0OTBsjkqxORlkzy+VZyHJ5sWTCaI6HYYd3ow6qkEEg==
533-
534-
"@next/swc-darwin-x64@12.0.10":
535-
version "12.0.10"
536-
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.0.10.tgz#a4306795159293c7d4d58a2c88ce1710ff0a8baa"
537-
integrity sha512-Qykcu/gVC5oTvOQoRBhyuS5GYm5SbcgrFTsaLFkGBmEkg9eMQRiaCswk4IafpDXVzITkVFurzSM28q3tLW2qUw==
538-
539-
"@next/swc-linux-arm-gnueabihf@12.0.10":
540-
version "12.0.10"
541-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.0.10.tgz#1ad15af3d5fca2fef57894d61e16f73aee61ec2e"
542-
integrity sha512-EhqrTFsIXAXN9B/fiiW/QKUK/lSLCXRsLalkUp58KDfMqVLLlj1ORbESAcswiNQOChLuHQSldGEEtOBPQZcd9A==
543-
544-
"@next/swc-linux-arm64-gnu@12.0.10":
545-
version "12.0.10"
546-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.0.10.tgz#a84a92d0e1a179c4346c9ed8f22e26f708101ad6"
547-
integrity sha512-kqGtC72g3+JYXZbY2ca6digXR5U6AQ6Dzv4eAxYluMePLHjI/Xye1mf9dwVsgmeXfrD/IRDp5K/3A6UNvBm4oQ==
548-
549-
"@next/swc-linux-arm64-musl@12.0.10":
550-
version "12.0.10"
551-
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.0.10.tgz#973ec96c77f845bd0a6eecbf1892caa1ee4defaf"
552-
integrity sha512-bG9zTSNwnSgc1Un/7oz1ZVN4UeXsTWrsQhAGWU78lLLCn4Zj9HQoUCRCGLt0OVs2DBZ+WC8CzzFliQ1SKipVbg==
553-
554-
"@next/swc-linux-x64-gnu@12.0.10":
555-
version "12.0.10"
556-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.0.10.tgz#efcc7f8252ea8225834760eaf09350f1bead73f7"
557-
integrity sha512-c79PcfWtyThiYRa1+3KVfDq0zXaI8o1d6dQWNVqDrtLz5HKM/rbjLdvoNuxDwUeZhxI/d9CtyH6GbuKPw5l/5A==
558-
559-
"@next/swc-linux-x64-musl@12.0.10":
560-
version "12.0.10"
561-
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.0.10.tgz#c2a73d939dfd310acc1892a0a132762500dd5757"
562-
integrity sha512-g/scgn+21/MLfizOCZOZt+MxNj2/8Tdlwjvy+QZcSUPZRUI2Y5o3HwBvI1f/bSci+NGRU+bUAO0NFtRJ9MzH5w==
563-
564-
"@next/swc-win32-arm64-msvc@12.0.10":
565-
version "12.0.10"
566-
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.0.10.tgz#2316af5f612cde1691abdf2571ff40ec32ea3429"
567-
integrity sha512-gl6B/ravwMeY5Nv4Il2/ARYJQ6u+KPRwGMjS1ZrNudIKlNn4YBeXh5A4cIVm+dHaff6/O/lGOa5/SUYDMZpkww==
568-
569-
"@next/swc-win32-ia32-msvc@12.0.10":
570-
version "12.0.10"
571-
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.0.10.tgz#98a4f74d164871cfaccb0df6efddf2b7bcbaa54b"
572-
integrity sha512-7RVpZ3tSThC6j+iZB0CUYmFiA3kXmN+pE7QcfyAxFaflKlaZoWNMKHIEZDuxSJc6YmQ6kyxsjqxVay2F5+/YCg==
573-
574-
"@next/swc-win32-x64-msvc@12.0.10":
575-
version "12.0.10"
576-
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.10.tgz#5c0ba98b695c4be44d8793aff42971a0dac65c2d"
577-
integrity sha512-oUIWRKd24jFLRWUYO1CZmML5+32BcpVfqhimGaaZIXcOkfQW+iqiAzdqsv688zaGtyKGeB9ZtiK3NDf+Q0v+Vw==
524+
"@next/swc-android-arm64@12.1.0":
525+
version "12.1.0"
526+
resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.1.0.tgz#865ba3a9afc204ff2bdeea49dd64d58705007a39"
527+
integrity sha512-/280MLdZe0W03stA69iL+v6I+J1ascrQ6FrXBlXGCsGzrfMaGr7fskMa0T5AhQIVQD4nA/46QQWxG//DYuFBcA==
528+
529+
"@next/swc-darwin-arm64@12.1.0":
530+
version "12.1.0"
531+
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.0.tgz#08e8b411b8accd095009ed12efbc2f1d4d547135"
532+
integrity sha512-R8vcXE2/iONJ1Unf5Ptqjk6LRW3bggH+8drNkkzH4FLEQkHtELhvcmJwkXcuipyQCsIakldAXhRbZmm3YN1vXg==
533+
534+
"@next/swc-darwin-x64@12.1.0":
535+
version "12.1.0"
536+
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.0.tgz#fcd684497a76e8feaca88db3c394480ff0b007cd"
537+
integrity sha512-ieAz0/J0PhmbZBB8+EA/JGdhRHBogF8BWaeqR7hwveb6SYEIJaDNQy0I+ZN8gF8hLj63bEDxJAs/cEhdnTq+ug==
538+
539+
"@next/swc-linux-arm-gnueabihf@12.1.0":
540+
version "12.1.0"
541+
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.0.tgz#9ec6380a27938a5799aaa6035c205b3c478468a7"
542+
integrity sha512-njUd9hpl6o6A5d08dC0cKAgXKCzm5fFtgGe6i0eko8IAdtAPbtHxtpre3VeSxdZvuGFh+hb0REySQP9T1ttkog==
543+
544+
"@next/swc-linux-arm64-gnu@12.1.0":
545+
version "12.1.0"
546+
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.0.tgz#7f4196dff1049cea479607c75b81033ae2dbd093"
547+
integrity sha512-OqangJLkRxVxMhDtcb7Qn1xjzFA3s50EIxY7mljbSCLybU+sByPaWAHY4px97ieOlr2y4S0xdPKkQ3BCAwyo6Q==
548+
549+
"@next/swc-linux-arm64-musl@12.1.0":
550+
version "12.1.0"
551+
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.0.tgz#b445f767569cdc2dddee785ca495e1a88c025566"
552+
integrity sha512-hB8cLSt4GdmOpcwRe2UzI5UWn6HHO/vLkr5OTuNvCJ5xGDwpPXelVkYW/0+C3g5axbDW2Tym4S+MQCkkH9QfWA==
553+
554+
"@next/swc-linux-x64-gnu@12.1.0":
555+
version "12.1.0"
556+
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.0.tgz#67610e9be4fbc987de7535f1bcb17e45fe12f90e"
557+
integrity sha512-OKO4R/digvrVuweSw/uBM4nSdyzsBV5EwkUeeG4KVpkIZEe64ZwRpnFB65bC6hGwxIBnTv5NMSnJ+0K/WmG78A==
558+
559+
"@next/swc-linux-x64-musl@12.1.0":
560+
version "12.1.0"
561+
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.0.tgz#ea19a23db08a9f2e34ac30401f774cf7d1669d31"
562+
integrity sha512-JohhgAHZvOD3rQY7tlp7NlmvtvYHBYgY0x5ZCecUT6eCCcl9lv6iV3nfu82ErkxNk1H893fqH0FUpznZ/H3pSw==
563+
564+
"@next/swc-win32-arm64-msvc@12.1.0":
565+
version "12.1.0"
566+
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.0.tgz#eadf054fc412085659b98e145435bbba200b5283"
567+
integrity sha512-T/3gIE6QEfKIJ4dmJk75v9hhNiYZhQYAoYm4iVo1TgcsuaKLFa+zMPh4056AHiG6n9tn2UQ1CFE8EoybEsqsSw==
568+
569+
"@next/swc-win32-ia32-msvc@12.1.0":
570+
version "12.1.0"
571+
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.0.tgz#68faeae10c89f698bf9d28759172b74c9c21bda1"
572+
integrity sha512-iwnKgHJdqhIW19H9PRPM9j55V6RdcOo6rX+5imx832BCWzkDbyomWnlzBfr6ByUYfhohb8QuH4hSGEikpPqI0Q==
573+
574+
"@next/swc-win32-x64-msvc@12.1.0":
575+
version "12.1.0"
576+
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.0.tgz#d27e7e76c87a460a4da99c5bfdb1618dcd6cd064"
577+
integrity sha512-aBvcbMwuanDH4EMrL2TthNJy+4nP59Bimn8egqv6GHMVj0a44cU6Au4PjOhLNqEh9l+IpRGBqMTzec94UdC5xg==
578578

579579
"@nodelib/[email protected]":
580580
version "2.1.5"
@@ -4531,28 +4531,28 @@ next-tick@~1.0.0:
45314531
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
45324532
integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
45334533

4534-
next@12.0.10:
4535-
version "12.0.10"
4536-
resolved "https://registry.yarnpkg.com/next/-/next-12.0.10.tgz#fcc4584177418bd777ce157f3165b7ba5e7708f7"
4537-
integrity sha512-1y3PpGzpb/EZzz1jgne+JfZXKAVJUjYXwxzrADf/LWN+8yi9o79vMLXpW3mevvCHkEF2sBnIdjzNn16TJrINUw==
4534+
next@^12.1.0:
4535+
version "12.1.0"
4536+
resolved "https://registry.yarnpkg.com/next/-/next-12.1.0.tgz#c33d753b644be92fc58e06e5a214f143da61dd5d"
4537+
integrity sha512-s885kWvnIlxsUFHq9UGyIyLiuD0G3BUC/xrH0CEnH5lHEWkwQcHOORgbDF0hbrW9vr/7am4ETfX4A7M6DjrE7Q==
45384538
dependencies:
4539-
"@next/env" "12.0.10"
4539+
"@next/env" "12.1.0"
45404540
caniuse-lite "^1.0.30001283"
45414541
postcss "8.4.5"
45424542
styled-jsx "5.0.0"
45434543
use-subscription "1.5.1"
45444544
optionalDependencies:
4545-
"@next/swc-android-arm64" "12.0.10"
4546-
"@next/swc-darwin-arm64" "12.0.10"
4547-
"@next/swc-darwin-x64" "12.0.10"
4548-
"@next/swc-linux-arm-gnueabihf" "12.0.10"
4549-
"@next/swc-linux-arm64-gnu" "12.0.10"
4550-
"@next/swc-linux-arm64-musl" "12.0.10"
4551-
"@next/swc-linux-x64-gnu" "12.0.10"
4552-
"@next/swc-linux-x64-musl" "12.0.10"
4553-
"@next/swc-win32-arm64-msvc" "12.0.10"
4554-
"@next/swc-win32-ia32-msvc" "12.0.10"
4555-
"@next/swc-win32-x64-msvc" "12.0.10"
4545+
"@next/swc-android-arm64" "12.1.0"
4546+
"@next/swc-darwin-arm64" "12.1.0"
4547+
"@next/swc-darwin-x64" "12.1.0"
4548+
"@next/swc-linux-arm-gnueabihf" "12.1.0"
4549+
"@next/swc-linux-arm64-gnu" "12.1.0"
4550+
"@next/swc-linux-arm64-musl" "12.1.0"
4551+
"@next/swc-linux-x64-gnu" "12.1.0"
4552+
"@next/swc-linux-x64-musl" "12.1.0"
4553+
"@next/swc-win32-arm64-msvc" "12.1.0"
4554+
"@next/swc-win32-ia32-msvc" "12.1.0"
4555+
"@next/swc-win32-x64-msvc" "12.1.0"
45564556

45574557
node-addon-api@^1.7.1:
45584558
version "1.7.2"
@@ -5011,7 +5011,7 @@ [email protected]:
50115011
dependencies:
50125012
es6-symbol "^3"
50135013

5014-
5014+
react-dom@^17.0.2:
50155015
version "17.0.2"
50165016
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
50175017
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
@@ -5111,7 +5111,7 @@ react-tiny-tooltip@^0.0.7:
51115111
"@radix-ui/react-tooltip" "^0.1.6"
51125112
"@stitches/react" "^1.2.6"
51135113

5114-
5114+
react@^17.0.2:
51155115
version "17.0.2"
51165116
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
51175117
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==

0 commit comments

Comments
 (0)