From b92790a7da7bca74867d8ed172da126e5d2776bf Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 14:25:24 -0800 Subject: [PATCH 01/19] setup new template --- .../templates/app/js/README-template.md | 4 +- .../templates/app/js/app/globals.css | 102 ++++- .../templates/app/js/app/page.jsx | 138 +++++-- .../templates/app/js/app/page.module.css | 349 +++++++++++++----- .../templates/app/js/gitignore | 6 +- .../templates/app/js/public/next.svg | 1 + .../templates/app/js/public/thirteen.svg | 1 + .../templates/app/js/public/vercel.svg | 5 +- .../templates/app/ts/app/globals.css | 102 ++++- .../templates/app/ts/app/layout.tsx | 2 +- .../templates/app/ts/app/page.module.css | 349 +++++++++++++----- .../templates/app/ts/app/page.tsx | 138 +++++-- .../templates/app/ts/gitignore | 6 +- .../templates/app/ts/public/next.svg | 1 + .../templates/app/ts/public/thirteen.svg | 1 + .../templates/app/ts/public/vercel.svg | 5 +- .../templates/default/js/gitignore | 6 +- .../templates/default/js/next.config.js | 1 + .../templates/default/js/pages/_app.js | 4 +- .../templates/default/js/pages/_document.js | 13 + .../templates/default/js/pages/index.js | 139 +++++-- .../templates/default/js/public/next.svg | 1 + .../templates/default/js/public/thirteen.svg | 1 + .../templates/default/js/public/vercel.svg | 5 +- .../default/js/styles/Home.module.css | 332 +++++++++++++---- .../templates/default/js/styles/globals.css | 102 ++++- .../templates/default/ts/gitignore | 2 +- .../templates/default/ts/pages/_document.tsx | 13 + .../templates/default/ts/pages/index.tsx | 139 +++++-- .../templates/default/ts/public/next.svg | 1 + .../templates/default/ts/public/thirteen.svg | 1 + .../templates/default/ts/public/vercel.svg | 5 +- .../default/ts/styles/Home.module.css | 332 +++++++++++++---- .../templates/default/ts/styles/globals.css | 102 ++++- packages/create-next-app/templates/index.ts | 3 +- 35 files changed, 1823 insertions(+), 589 deletions(-) create mode 100644 packages/create-next-app/templates/app/js/public/next.svg create mode 100644 packages/create-next-app/templates/app/js/public/thirteen.svg create mode 100644 packages/create-next-app/templates/app/ts/public/next.svg create mode 100644 packages/create-next-app/templates/app/ts/public/thirteen.svg create mode 100644 packages/create-next-app/templates/default/js/pages/_document.js create mode 100644 packages/create-next-app/templates/default/js/public/next.svg create mode 100644 packages/create-next-app/templates/default/js/public/thirteen.svg create mode 100644 packages/create-next-app/templates/default/ts/pages/_document.tsx create mode 100644 packages/create-next-app/templates/default/ts/public/next.svg create mode 100644 packages/create-next-app/templates/default/ts/public/thirteen.svg diff --git a/packages/create-next-app/templates/app/js/README-template.md b/packages/create-next-app/templates/app/js/README-template.md index 331172e45f6d009..e0e00771d879691 100644 --- a/packages/create-next-app/templates/app/js/README-template.md +++ b/packages/create-next-app/templates/app/js/README-template.md @@ -12,9 +12,9 @@ yarn dev Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. -You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. +You can start editing the page by modifying `app/page.jsx`. The page auto-updates as you edit the file. -[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`. +[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.js`. The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages. diff --git a/packages/create-next-app/templates/app/js/app/globals.css b/packages/create-next-app/templates/app/js/app/globals.css index 4f1842163d2220c..c183def8b534c5a 100644 --- a/packages/create-next-app/templates/app/js/app/globals.css +++ b/packages/create-next-app/templates/app/js/app/globals.css @@ -1,9 +1,95 @@ -html, -body { +:root { + --max-width: 1100px; + --border-radius: 12px; + + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; + + --primary-glow: conic-gradient( + from 180deg at 50% 50%, + #16abff33 0deg, + #0885ff33 55deg, + #54d6ff33 120deg, + #0071ff33 160deg, + transparent 360deg + ); + --secondary-glow: radial-gradient( + rgba(255, 255, 255, 1), + rgba(255, 255, 255, 0) + ); + + --tile-start-rgb: 239, 245, 249; + --tile-end-rgb: 228, 232, 233; + --tile-border: conic-gradient( + #00000080, + #00000040, + #00000030, + #00000020, + #00000010, + #00000010, + #00000080 + ); + + --callout-rgb: 238, 240, 241; + --callout-border-rgb: 172, 175, 176; + --card-rgb: 180, 185, 188; + --card-border-rgb: 131, 134, 135; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + + --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); + --secondary-glow: linear-gradient( + to bottom right, + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0.3) + ); + + --tile-start-rgb: 2, 13, 46; + --tile-end-rgb: 2, 5, 19; + --tile-border: conic-gradient( + #ffffff80, + #ffffff40, + #ffffff30, + #ffffff20, + #ffffff10, + #ffffff10, + #ffffff80 + ); + + --callout-rgb: 20, 20, 20; + --callout-border-rgb: 108, 108, 108; + --card-rgb: 100, 100, 100; + --card-border-rgb: 200, 200, 200; + } +} + +* { + box-sizing: border-box; padding: 0; margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; +} + +html, +body { + max-width: 100vw; + overflow-x: hidden; +} + +body { + color: rbg(--foreground-rgb); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); } a { @@ -11,16 +97,8 @@ a { text-decoration: none; } -* { - box-sizing: border-box; -} - @media (prefers-color-scheme: dark) { html { color-scheme: dark; } - body { - color: white; - background: black; - } } diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 35bd2649d4ccabd..cb1c7eac50a1fe5 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -1,57 +1,129 @@ import Image from 'next/image' +import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' import styles from './page.module.css' +const inter = Inter({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceGrotesk = Space_Grotesk({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceMono = Space_Mono({ + weight: ['400', '700'], + subsets: ['latin'], + variable: '--font-mono', + fallback: ['ui-monospace', 'monospace'], +}) + export default function Home() { return ( -
-
-

- Welcome to Next.js 13! -

+ <> +
+
+

+ Get started by editing  + pages/index.js +

+ +
-

- Get started by editing{' '} - app/page.tsx -

+
+
+ Next.js Logo +
+
+ 13 +
+
- -

Documentation →

-

Find in-depth information about Next.js 13

+
+

+ Docs -> +

+

+ Find in-depth information about Next.js features and API. +

+
+ + +

+ Learn -> +

+

+ Learn about Next.js in an interactive course with quizzes! +

-

Examples →

-

Explore the Next.js 13 playground.

+

+ Templates -> +

+

+ Discover and deploy boilerplate example Next.js projects. +

-

Deploy →

-

Deploy your Next.js site to a public URL with Vercel.

+

+ Deploy -> +

+

+ Instantly deploy your Next.js site to a shareable URL with Vercel. +

-
- - -
+ + ) } diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index a978c99de57b3a0..cf6bb4b891a9c2f 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -1,146 +1,297 @@ -.container { - padding: 0 2rem; -} - -.main { - min-height: 100vh; - padding: 4rem 0; - flex: 1; +.content { display: flex; - flex-direction: column; - justify-content: center; + flex-flow: column; + justify-content: space-between; align-items: center; + padding: 6rem; + min-height: 100vh; } -.footer { - display: flex; - flex: 1; - padding: 2rem 0; - border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; +.description { + display: inherit; + justify-content: inherit; + align-items: inherit; + text-align: center; + font-size: 0.9rem; + max-width: var(--max-width); + width: 100%; } -.footer a { +.description a { display: flex; - justify-content: center; align-items: center; - flex-grow: 1; + justify-content: center; + line-height: 1.5rem; } -.title { +.description p { + position: relative; margin: 0; - line-height: 1.15; - font-size: 4rem; - font-style: normal; - font-weight: 800; - letter-spacing: -0.025em; + padding: 0.8rem 1rem 0.9rem; + background-color: rgba(var(--callout-rgb), 0.5); + border: 1px solid rgba(var(--callout-border-rgb), 0.3); + border-radius: var(--border-radius); + z-index: 1; } -.title a { - text-decoration: none; - color: #0070f3; +.code { + font-weight: 700; + font-family: var(--font-mono); } -.title a:hover, -.title a:focus, -.title a:active { - text-decoration: underline; +.grid { + display: grid; + grid-template-columns: repeat(4, minmax(25%, auto)); + width: var(--max-width); + max-width: 100%; } -.title, -.description { - text-align: center; +.card { + padding: 1rem 1.2rem; + border-radius: var(--border-radius); + background: rgba(var(--card-rgb), 0); + border: 1px solid rgba(var(--card-border-rgb), 0); + transition: background 200ms, border 200ms; } -.description { - margin: 4rem 0; - line-height: 1.5; - font-size: 1.5rem; +.card span { + display: inline-block; + transform: translateX(0); + transition: transform 200ms; } -.code { - background: #fafafa; - border-radius: 5px; - padding: 0.75rem; - font-size: 1.1rem; - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; +.card h2 { + font-weight: 600; + margin: 0 0 0.7rem 0; } -.grid { +.card p { + margin: 0; + opacity: 0.6; + font-size: 0.9rem; + line-height: 125%; + max-width: 32ch; + letter-spacing: -0.01em; +} + +.vercel-logo { + height: 1.5rem; + margin-left: 0.5rem; +} + +.center { display: flex; + justify-content: center; align-items: center; + box-sizing: content-box; + position: relative; + width: 100vw; + padding: 4rem 0; + flex-grow: 1; +} + +.center::before { + background: var(--secondary-glow); + border-radius: 50%; + width: 480px; + height: 360px; + left: 50%; + margin-left: -400px; +} + +.center::after { + left: 50%; + background: var(--primary-glow); + width: 240px; + height: 180px; + z-index: -1; +} + +.center::before, +.center::after { + content: ''; + position: absolute; + filter: blur(45px); + transform: translateZ(0); +} + +.logo, +.thirteen { + position: relative; +} + +.thirteen { + display: flex; justify-content: center; - flex-wrap: wrap; - max-width: 1200px; + align-items: center; + width: 75px; + height: 75px; + padding: 25px 10px; + margin-left: 16px; + transform: translateZ(0); + border-radius: var(--border-radius); + overflow: hidden; + box-shadow: 0px 2px 8px -1px #0000001a; } -.card { - margin: 1rem; - padding: 1.5rem; - text-align: left; - color: inherit; - text-decoration: none; - border: 1px solid #eaeaea; - border-radius: 10px; - transition: color 0.15s ease, border-color 0.15s ease; - max-width: 300px; +.thirteen img { + z-index: 1; } -.card:hover, -.card:focus, -.card:active { - color: #0070f3; - border-color: #0070f3; +/* Conic Gradient Animation */ +.thirteen::before { + content: ''; + position: absolute; + animation: 6s rotate 1s linear infinite; + z-index: -1; + width: 200%; + height: 200%; + background: var(--tile-border); } -.card h2 { - margin: 0 0 1rem 0; - font-size: 1.5rem; +/* Inner Square */ +.thirteen::after { + content: ''; + position: absolute; + inset: 0; + padding: 1px; + border-radius: var(--border-radius); + background: linear-gradient( + to bottom right, + rgba(var(--tile-start-rgb), 1), + rgba(var(--tile-end-rgb), 1) + ); + background-clip: content-box; + z-index: 0; } -.card p { - margin: 0; - font-size: 1.25rem; - line-height: 1.5; +/* Enable hover only on non-touch devices */ +@media (hover: hover) and (pointer: fine) { + .card:hover { + background: rgba(var(--card-rgb), 0.1); + border: 1px solid rgba(var(--card-border-rgb), 0.15); + } + + .card:hover span { + transform: translateX(4px); + transition: transform 200ms; + } } -.logo { - height: 1em; - margin-left: 0.5rem; +@media (prefers-reduced-motion) { + .thirteen::before { + animation: none; + } } -@media (max-width: 600px) { +/* Mobile */ +@media (max-width: 700px) { + .content { + padding: 4rem; + } + .grid { - width: 100%; + grid-template-columns: 1fr; flex-direction: column; + margin-bottom: 120px; + max-width: 320px; + text-align: center; + } + + .card { + padding-left: 40px; + padding-right: 40px; + } + + .card h2 { + margin: 0 0 0.5rem 0; + } + + .center { + padding: 8rem 0 6rem; + } + + .center::before { + transform: none; + width: 100vw; + height: 300px; + } + + .description p, + .description a { + font-size: 0.8rem; + padding: 1rem; + width: 100%; + } + + .description p { + position: fixed; + top: 0; + left: 0; + right: 0; + display: flex; + align-items: center; + justify-content: center; + inset: 0 0 auto; + width: 100vw; + padding: 2rem 1rem 1.4rem; + border-radius: 0; + border: none; + border-bottom: 1px solid rgba(var(--callout-border-rgb), 0.25); + background: linear-gradient( + to bottom, + rgba(var(--background-start-rgb), 1), + rgba(var(--callout-rgb), 0.5) + ); + background-clip: padding-box; + backdrop-filter: blur(24px); + } + + .description div { + display: flex; + align-items: flex-end; + justify-content: center; + position: fixed; + pointer-events: none; + left: 0; + bottom: 0; + padding: 2rem; + height: 200px; + width: 100%; + background: linear-gradient( + to bottom, + transparent 0%, + rgb(var(--background-end-rgb)) 40% + ); + z-index: 1; + } +} + +/* Tablet and Smaller Desktop */ +@media (min-width: 701px) and (max-width: 1120px) { + .grid { + gap: 0; + grid-template-columns: repeat(2, 50%); + width: 100%; } } @media (prefers-color-scheme: dark) { - .title { - background: linear-gradient(180deg, #ffffff 0%, #aaaaaa 100%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - text-fill-color: transparent; - } - .title a { - background: linear-gradient(180deg, #0070f3 0%, #0153af 100%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - text-fill-color: transparent; - } - .card, - .footer { - border-color: #222; - } - .code { - background: #111; - } - .logo img { + .vercel-logo img { filter: invert(1); } + + .logo img, + .thirteen img { + filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); + } +} + +@keyframes rotate { + from { + transform: rotate(360deg); + } + to { + transform: rotate(0deg); + } } diff --git a/packages/create-next-app/templates/app/js/gitignore b/packages/create-next-app/templates/app/js/gitignore index c87c9b392c0200d..56cffa71ef6b6b4 100644 --- a/packages/create-next-app/templates/app/js/gitignore +++ b/packages/create-next-app/templates/app/js/gitignore @@ -29,8 +29,4 @@ yarn-error.log* .env*.local # vercel -.vercel - -# typescript -*.tsbuildinfo -next-env.d.ts +.vercel \ No newline at end of file diff --git a/packages/create-next-app/templates/app/js/public/next.svg b/packages/create-next-app/templates/app/js/public/next.svg new file mode 100644 index 000000000000000..5174b28c565c285 --- /dev/null +++ b/packages/create-next-app/templates/app/js/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/app/js/public/thirteen.svg b/packages/create-next-app/templates/app/js/public/thirteen.svg new file mode 100644 index 000000000000000..8977c1bd123cbe4 --- /dev/null +++ b/packages/create-next-app/templates/app/js/public/thirteen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/app/js/public/vercel.svg b/packages/create-next-app/templates/app/js/public/vercel.svg index fbf0e25a651c289..d2f84222734f27b 100644 --- a/packages/create-next-app/templates/app/js/public/vercel.svg +++ b/packages/create-next-app/templates/app/js/public/vercel.svg @@ -1,4 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/packages/create-next-app/templates/app/ts/app/globals.css b/packages/create-next-app/templates/app/ts/app/globals.css index 4f1842163d2220c..c183def8b534c5a 100644 --- a/packages/create-next-app/templates/app/ts/app/globals.css +++ b/packages/create-next-app/templates/app/ts/app/globals.css @@ -1,9 +1,95 @@ -html, -body { +:root { + --max-width: 1100px; + --border-radius: 12px; + + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; + + --primary-glow: conic-gradient( + from 180deg at 50% 50%, + #16abff33 0deg, + #0885ff33 55deg, + #54d6ff33 120deg, + #0071ff33 160deg, + transparent 360deg + ); + --secondary-glow: radial-gradient( + rgba(255, 255, 255, 1), + rgba(255, 255, 255, 0) + ); + + --tile-start-rgb: 239, 245, 249; + --tile-end-rgb: 228, 232, 233; + --tile-border: conic-gradient( + #00000080, + #00000040, + #00000030, + #00000020, + #00000010, + #00000010, + #00000080 + ); + + --callout-rgb: 238, 240, 241; + --callout-border-rgb: 172, 175, 176; + --card-rgb: 180, 185, 188; + --card-border-rgb: 131, 134, 135; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + + --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); + --secondary-glow: linear-gradient( + to bottom right, + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0.3) + ); + + --tile-start-rgb: 2, 13, 46; + --tile-end-rgb: 2, 5, 19; + --tile-border: conic-gradient( + #ffffff80, + #ffffff40, + #ffffff30, + #ffffff20, + #ffffff10, + #ffffff10, + #ffffff80 + ); + + --callout-rgb: 20, 20, 20; + --callout-border-rgb: 108, 108, 108; + --card-rgb: 100, 100, 100; + --card-border-rgb: 200, 200, 200; + } +} + +* { + box-sizing: border-box; padding: 0; margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; +} + +html, +body { + max-width: 100vw; + overflow-x: hidden; +} + +body { + color: rbg(--foreground-rgb); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); } a { @@ -11,16 +97,8 @@ a { text-decoration: none; } -* { - box-sizing: border-box; -} - @media (prefers-color-scheme: dark) { html { color-scheme: dark; } - body { - color: white; - background: black; - } } diff --git a/packages/create-next-app/templates/app/ts/app/layout.tsx b/packages/create-next-app/templates/app/ts/app/layout.tsx index 245bd756ae580f7..df5100c220621de 100644 --- a/packages/create-next-app/templates/app/ts/app/layout.tsx +++ b/packages/create-next-app/templates/app/ts/app/layout.tsx @@ -9,7 +9,7 @@ export default function RootLayout({ {/* will contain the components returned by the nearest parent - head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head + head.jsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head */} {children} diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index a978c99de57b3a0..cf6bb4b891a9c2f 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -1,146 +1,297 @@ -.container { - padding: 0 2rem; -} - -.main { - min-height: 100vh; - padding: 4rem 0; - flex: 1; +.content { display: flex; - flex-direction: column; - justify-content: center; + flex-flow: column; + justify-content: space-between; align-items: center; + padding: 6rem; + min-height: 100vh; } -.footer { - display: flex; - flex: 1; - padding: 2rem 0; - border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; +.description { + display: inherit; + justify-content: inherit; + align-items: inherit; + text-align: center; + font-size: 0.9rem; + max-width: var(--max-width); + width: 100%; } -.footer a { +.description a { display: flex; - justify-content: center; align-items: center; - flex-grow: 1; + justify-content: center; + line-height: 1.5rem; } -.title { +.description p { + position: relative; margin: 0; - line-height: 1.15; - font-size: 4rem; - font-style: normal; - font-weight: 800; - letter-spacing: -0.025em; + padding: 0.8rem 1rem 0.9rem; + background-color: rgba(var(--callout-rgb), 0.5); + border: 1px solid rgba(var(--callout-border-rgb), 0.3); + border-radius: var(--border-radius); + z-index: 1; } -.title a { - text-decoration: none; - color: #0070f3; +.code { + font-weight: 700; + font-family: var(--font-mono); } -.title a:hover, -.title a:focus, -.title a:active { - text-decoration: underline; +.grid { + display: grid; + grid-template-columns: repeat(4, minmax(25%, auto)); + width: var(--max-width); + max-width: 100%; } -.title, -.description { - text-align: center; +.card { + padding: 1rem 1.2rem; + border-radius: var(--border-radius); + background: rgba(var(--card-rgb), 0); + border: 1px solid rgba(var(--card-border-rgb), 0); + transition: background 200ms, border 200ms; } -.description { - margin: 4rem 0; - line-height: 1.5; - font-size: 1.5rem; +.card span { + display: inline-block; + transform: translateX(0); + transition: transform 200ms; } -.code { - background: #fafafa; - border-radius: 5px; - padding: 0.75rem; - font-size: 1.1rem; - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; +.card h2 { + font-weight: 600; + margin: 0 0 0.7rem 0; } -.grid { +.card p { + margin: 0; + opacity: 0.6; + font-size: 0.9rem; + line-height: 125%; + max-width: 32ch; + letter-spacing: -0.01em; +} + +.vercel-logo { + height: 1.5rem; + margin-left: 0.5rem; +} + +.center { display: flex; + justify-content: center; align-items: center; + box-sizing: content-box; + position: relative; + width: 100vw; + padding: 4rem 0; + flex-grow: 1; +} + +.center::before { + background: var(--secondary-glow); + border-radius: 50%; + width: 480px; + height: 360px; + left: 50%; + margin-left: -400px; +} + +.center::after { + left: 50%; + background: var(--primary-glow); + width: 240px; + height: 180px; + z-index: -1; +} + +.center::before, +.center::after { + content: ''; + position: absolute; + filter: blur(45px); + transform: translateZ(0); +} + +.logo, +.thirteen { + position: relative; +} + +.thirteen { + display: flex; justify-content: center; - flex-wrap: wrap; - max-width: 1200px; + align-items: center; + width: 75px; + height: 75px; + padding: 25px 10px; + margin-left: 16px; + transform: translateZ(0); + border-radius: var(--border-radius); + overflow: hidden; + box-shadow: 0px 2px 8px -1px #0000001a; } -.card { - margin: 1rem; - padding: 1.5rem; - text-align: left; - color: inherit; - text-decoration: none; - border: 1px solid #eaeaea; - border-radius: 10px; - transition: color 0.15s ease, border-color 0.15s ease; - max-width: 300px; +.thirteen img { + z-index: 1; } -.card:hover, -.card:focus, -.card:active { - color: #0070f3; - border-color: #0070f3; +/* Conic Gradient Animation */ +.thirteen::before { + content: ''; + position: absolute; + animation: 6s rotate 1s linear infinite; + z-index: -1; + width: 200%; + height: 200%; + background: var(--tile-border); } -.card h2 { - margin: 0 0 1rem 0; - font-size: 1.5rem; +/* Inner Square */ +.thirteen::after { + content: ''; + position: absolute; + inset: 0; + padding: 1px; + border-radius: var(--border-radius); + background: linear-gradient( + to bottom right, + rgba(var(--tile-start-rgb), 1), + rgba(var(--tile-end-rgb), 1) + ); + background-clip: content-box; + z-index: 0; } -.card p { - margin: 0; - font-size: 1.25rem; - line-height: 1.5; +/* Enable hover only on non-touch devices */ +@media (hover: hover) and (pointer: fine) { + .card:hover { + background: rgba(var(--card-rgb), 0.1); + border: 1px solid rgba(var(--card-border-rgb), 0.15); + } + + .card:hover span { + transform: translateX(4px); + transition: transform 200ms; + } } -.logo { - height: 1em; - margin-left: 0.5rem; +@media (prefers-reduced-motion) { + .thirteen::before { + animation: none; + } } -@media (max-width: 600px) { +/* Mobile */ +@media (max-width: 700px) { + .content { + padding: 4rem; + } + .grid { - width: 100%; + grid-template-columns: 1fr; flex-direction: column; + margin-bottom: 120px; + max-width: 320px; + text-align: center; + } + + .card { + padding-left: 40px; + padding-right: 40px; + } + + .card h2 { + margin: 0 0 0.5rem 0; + } + + .center { + padding: 8rem 0 6rem; + } + + .center::before { + transform: none; + width: 100vw; + height: 300px; + } + + .description p, + .description a { + font-size: 0.8rem; + padding: 1rem; + width: 100%; + } + + .description p { + position: fixed; + top: 0; + left: 0; + right: 0; + display: flex; + align-items: center; + justify-content: center; + inset: 0 0 auto; + width: 100vw; + padding: 2rem 1rem 1.4rem; + border-radius: 0; + border: none; + border-bottom: 1px solid rgba(var(--callout-border-rgb), 0.25); + background: linear-gradient( + to bottom, + rgba(var(--background-start-rgb), 1), + rgba(var(--callout-rgb), 0.5) + ); + background-clip: padding-box; + backdrop-filter: blur(24px); + } + + .description div { + display: flex; + align-items: flex-end; + justify-content: center; + position: fixed; + pointer-events: none; + left: 0; + bottom: 0; + padding: 2rem; + height: 200px; + width: 100%; + background: linear-gradient( + to bottom, + transparent 0%, + rgb(var(--background-end-rgb)) 40% + ); + z-index: 1; + } +} + +/* Tablet and Smaller Desktop */ +@media (min-width: 701px) and (max-width: 1120px) { + .grid { + gap: 0; + grid-template-columns: repeat(2, 50%); + width: 100%; } } @media (prefers-color-scheme: dark) { - .title { - background: linear-gradient(180deg, #ffffff 0%, #aaaaaa 100%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - text-fill-color: transparent; - } - .title a { - background: linear-gradient(180deg, #0070f3 0%, #0153af 100%); - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - text-fill-color: transparent; - } - .card, - .footer { - border-color: #222; - } - .code { - background: #111; - } - .logo img { + .vercel-logo img { filter: invert(1); } + + .logo img, + .thirteen img { + filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); + } +} + +@keyframes rotate { + from { + transform: rotate(360deg); + } + to { + transform: rotate(0deg); + } } diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 35bd2649d4ccabd..cb1c7eac50a1fe5 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -1,57 +1,129 @@ import Image from 'next/image' +import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' import styles from './page.module.css' +const inter = Inter({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceGrotesk = Space_Grotesk({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceMono = Space_Mono({ + weight: ['400', '700'], + subsets: ['latin'], + variable: '--font-mono', + fallback: ['ui-monospace', 'monospace'], +}) + export default function Home() { return ( -
-
-

- Welcome to Next.js 13! -

+ <> +
+
+

+ Get started by editing  + pages/index.js +

+ +
-

- Get started by editing{' '} - app/page.tsx -

+
+
+ Next.js Logo +
+
+ 13 +
+
- -

Documentation →

-

Find in-depth information about Next.js 13

+
+

+ Docs -> +

+

+ Find in-depth information about Next.js features and API. +

+
+ + +

+ Learn -> +

+

+ Learn about Next.js in an interactive course with quizzes! +

-

Examples →

-

Explore the Next.js 13 playground.

+

+ Templates -> +

+

+ Discover and deploy boilerplate example Next.js projects. +

-

Deploy →

-

Deploy your Next.js site to a public URL with Vercel.

+

+ Deploy -> +

+

+ Instantly deploy your Next.js site to a shareable URL with Vercel. +

-
- - -
+ + ) } diff --git a/packages/create-next-app/templates/app/ts/gitignore b/packages/create-next-app/templates/app/ts/gitignore index c87c9b392c0200d..56cffa71ef6b6b4 100644 --- a/packages/create-next-app/templates/app/ts/gitignore +++ b/packages/create-next-app/templates/app/ts/gitignore @@ -29,8 +29,4 @@ yarn-error.log* .env*.local # vercel -.vercel - -# typescript -*.tsbuildinfo -next-env.d.ts +.vercel \ No newline at end of file diff --git a/packages/create-next-app/templates/app/ts/public/next.svg b/packages/create-next-app/templates/app/ts/public/next.svg new file mode 100644 index 000000000000000..5174b28c565c285 --- /dev/null +++ b/packages/create-next-app/templates/app/ts/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/app/ts/public/thirteen.svg b/packages/create-next-app/templates/app/ts/public/thirteen.svg new file mode 100644 index 000000000000000..8977c1bd123cbe4 --- /dev/null +++ b/packages/create-next-app/templates/app/ts/public/thirteen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/app/ts/public/vercel.svg b/packages/create-next-app/templates/app/ts/public/vercel.svg index fbf0e25a651c289..d2f84222734f27b 100644 --- a/packages/create-next-app/templates/app/ts/public/vercel.svg +++ b/packages/create-next-app/templates/app/ts/public/vercel.svg @@ -1,4 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/js/gitignore b/packages/create-next-app/templates/default/js/gitignore index c87c9b392c0200d..56cffa71ef6b6b4 100644 --- a/packages/create-next-app/templates/default/js/gitignore +++ b/packages/create-next-app/templates/default/js/gitignore @@ -29,8 +29,4 @@ yarn-error.log* .env*.local # vercel -.vercel - -# typescript -*.tsbuildinfo -next-env.d.ts +.vercel \ No newline at end of file diff --git a/packages/create-next-app/templates/default/js/next.config.js b/packages/create-next-app/templates/default/js/next.config.js index a843cbee09afaad..ae887958d3c9c94 100644 --- a/packages/create-next-app/templates/default/js/next.config.js +++ b/packages/create-next-app/templates/default/js/next.config.js @@ -1,6 +1,7 @@ /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, + swcMinify: true, } module.exports = nextConfig diff --git a/packages/create-next-app/templates/default/js/pages/_app.js b/packages/create-next-app/templates/default/js/pages/_app.js index 1e1cec92425c8b3..048541e25b1dd21 100644 --- a/packages/create-next-app/templates/default/js/pages/_app.js +++ b/packages/create-next-app/templates/default/js/pages/_app.js @@ -1,7 +1,5 @@ import '../styles/globals.css' -function MyApp({ Component, pageProps }) { +export default function App({ Component, pageProps }) { return } - -export default MyApp diff --git a/packages/create-next-app/templates/default/js/pages/_document.js b/packages/create-next-app/templates/default/js/pages/_document.js new file mode 100644 index 000000000000000..54e8bf3e2a29015 --- /dev/null +++ b/packages/create-next-app/templates/default/js/pages/_document.js @@ -0,0 +1,13 @@ +import { Html, Head, Main, NextScript } from 'next/document' + +export default function Document() { + return ( + + + +
+ + + + ) +} diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 5bf5574341670a5..66f86dc61de5553 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -1,43 +1,119 @@ import Head from 'next/head' import Image from 'next/image' +import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' import styles from '../styles/Home.module.css' +const inter = Inter({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceGrotesk = Space_Grotesk({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceMono = Space_Mono({ + weight: ['400', '700'], + subsets: ['latin'], + variable: '--font-mono', + fallback: ['ui-monospace', 'monospace'], +}) + export default function Home() { return ( -
+ <> Create Next App + +
+
+

+ Get started by editing  + pages/index.js +

+ +
-
-

- Welcome to Next.js! -

- -

- Get started by editing{' '} - pages/index.js -

+
+
+ Next.js Logo +
+
+ 13 +
+
-
- - -
+
+ ) } diff --git a/packages/create-next-app/templates/default/js/public/next.svg b/packages/create-next-app/templates/default/js/public/next.svg new file mode 100644 index 000000000000000..5174b28c565c285 --- /dev/null +++ b/packages/create-next-app/templates/default/js/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/js/public/thirteen.svg b/packages/create-next-app/templates/default/js/public/thirteen.svg new file mode 100644 index 000000000000000..8977c1bd123cbe4 --- /dev/null +++ b/packages/create-next-app/templates/default/js/public/thirteen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/js/public/vercel.svg b/packages/create-next-app/templates/default/js/public/vercel.svg index fbf0e25a651c289..d2f84222734f27b 100644 --- a/packages/create-next-app/templates/default/js/public/vercel.svg +++ b/packages/create-next-app/templates/default/js/public/vercel.svg @@ -1,4 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index bd50f42ffe6a26e..cf6bb4b891a9c2f 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -1,129 +1,297 @@ -.container { - padding: 0 2rem; -} - -.main { - min-height: 100vh; - padding: 4rem 0; - flex: 1; +.content { display: flex; - flex-direction: column; - justify-content: center; + flex-flow: column; + justify-content: space-between; align-items: center; + padding: 6rem; + min-height: 100vh; } -.footer { - display: flex; - flex: 1; - padding: 2rem 0; - border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; +.description { + display: inherit; + justify-content: inherit; + align-items: inherit; + text-align: center; + font-size: 0.9rem; + max-width: var(--max-width); + width: 100%; } -.footer a { +.description a { display: flex; - justify-content: center; align-items: center; - flex-grow: 1; + justify-content: center; + line-height: 1.5rem; } -.title a { - color: #0070f3; - text-decoration: none; +.description p { + position: relative; + margin: 0; + padding: 0.8rem 1rem 0.9rem; + background-color: rgba(var(--callout-rgb), 0.5); + border: 1px solid rgba(var(--callout-border-rgb), 0.3); + border-radius: var(--border-radius); + z-index: 1; } -.title a:hover, -.title a:focus, -.title a:active { - text-decoration: underline; +.code { + font-weight: 700; + font-family: var(--font-mono); } -.title { - margin: 0; - line-height: 1.15; - font-size: 4rem; +.grid { + display: grid; + grid-template-columns: repeat(4, minmax(25%, auto)); + width: var(--max-width); + max-width: 100%; } -.title, -.description { - text-align: center; +.card { + padding: 1rem 1.2rem; + border-radius: var(--border-radius); + background: rgba(var(--card-rgb), 0); + border: 1px solid rgba(var(--card-border-rgb), 0); + transition: background 200ms, border 200ms; } -.description { - margin: 4rem 0; - line-height: 1.5; - font-size: 1.5rem; +.card span { + display: inline-block; + transform: translateX(0); + transition: transform 200ms; } -.code { - background: #fafafa; - border-radius: 5px; - padding: 0.75rem; - font-size: 1.1rem; - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; +.card h2 { + font-weight: 600; + margin: 0 0 0.7rem 0; } -.grid { +.card p { + margin: 0; + opacity: 0.6; + font-size: 0.9rem; + line-height: 125%; + max-width: 32ch; + letter-spacing: -0.01em; +} + +.vercel-logo { + height: 1.5rem; + margin-left: 0.5rem; +} + +.center { display: flex; + justify-content: center; align-items: center; + box-sizing: content-box; + position: relative; + width: 100vw; + padding: 4rem 0; + flex-grow: 1; +} + +.center::before { + background: var(--secondary-glow); + border-radius: 50%; + width: 480px; + height: 360px; + left: 50%; + margin-left: -400px; +} + +.center::after { + left: 50%; + background: var(--primary-glow); + width: 240px; + height: 180px; + z-index: -1; +} + +.center::before, +.center::after { + content: ''; + position: absolute; + filter: blur(45px); + transform: translateZ(0); +} + +.logo, +.thirteen { + position: relative; +} + +.thirteen { + display: flex; justify-content: center; - flex-wrap: wrap; - max-width: 800px; + align-items: center; + width: 75px; + height: 75px; + padding: 25px 10px; + margin-left: 16px; + transform: translateZ(0); + border-radius: var(--border-radius); + overflow: hidden; + box-shadow: 0px 2px 8px -1px #0000001a; } -.card { - margin: 1rem; - padding: 1.5rem; - text-align: left; - color: inherit; - text-decoration: none; - border: 1px solid #eaeaea; - border-radius: 10px; - transition: color 0.15s ease, border-color 0.15s ease; - max-width: 300px; +.thirteen img { + z-index: 1; } -.card:hover, -.card:focus, -.card:active { - color: #0070f3; - border-color: #0070f3; +/* Conic Gradient Animation */ +.thirteen::before { + content: ''; + position: absolute; + animation: 6s rotate 1s linear infinite; + z-index: -1; + width: 200%; + height: 200%; + background: var(--tile-border); } -.card h2 { - margin: 0 0 1rem 0; - font-size: 1.5rem; +/* Inner Square */ +.thirteen::after { + content: ''; + position: absolute; + inset: 0; + padding: 1px; + border-radius: var(--border-radius); + background: linear-gradient( + to bottom right, + rgba(var(--tile-start-rgb), 1), + rgba(var(--tile-end-rgb), 1) + ); + background-clip: content-box; + z-index: 0; } -.card p { - margin: 0; - font-size: 1.25rem; - line-height: 1.5; +/* Enable hover only on non-touch devices */ +@media (hover: hover) and (pointer: fine) { + .card:hover { + background: rgba(var(--card-rgb), 0.1); + border: 1px solid rgba(var(--card-border-rgb), 0.15); + } + + .card:hover span { + transform: translateX(4px); + transition: transform 200ms; + } } -.logo { - height: 1em; - margin-left: 0.5rem; +@media (prefers-reduced-motion) { + .thirteen::before { + animation: none; + } } -@media (max-width: 600px) { +/* Mobile */ +@media (max-width: 700px) { + .content { + padding: 4rem; + } + .grid { - width: 100%; + grid-template-columns: 1fr; flex-direction: column; + margin-bottom: 120px; + max-width: 320px; + text-align: center; + } + + .card { + padding-left: 40px; + padding-right: 40px; + } + + .card h2 { + margin: 0 0 0.5rem 0; + } + + .center { + padding: 8rem 0 6rem; + } + + .center::before { + transform: none; + width: 100vw; + height: 300px; + } + + .description p, + .description a { + font-size: 0.8rem; + padding: 1rem; + width: 100%; + } + + .description p { + position: fixed; + top: 0; + left: 0; + right: 0; + display: flex; + align-items: center; + justify-content: center; + inset: 0 0 auto; + width: 100vw; + padding: 2rem 1rem 1.4rem; + border-radius: 0; + border: none; + border-bottom: 1px solid rgba(var(--callout-border-rgb), 0.25); + background: linear-gradient( + to bottom, + rgba(var(--background-start-rgb), 1), + rgba(var(--callout-rgb), 0.5) + ); + background-clip: padding-box; + backdrop-filter: blur(24px); + } + + .description div { + display: flex; + align-items: flex-end; + justify-content: center; + position: fixed; + pointer-events: none; + left: 0; + bottom: 0; + padding: 2rem; + height: 200px; + width: 100%; + background: linear-gradient( + to bottom, + transparent 0%, + rgb(var(--background-end-rgb)) 40% + ); + z-index: 1; + } +} + +/* Tablet and Smaller Desktop */ +@media (min-width: 701px) and (max-width: 1120px) { + .grid { + gap: 0; + grid-template-columns: repeat(2, 50%); + width: 100%; } } @media (prefers-color-scheme: dark) { - .card, - .footer { - border-color: #222; + .vercel-logo img { + filter: invert(1); } - .code { - background: #111; + + .logo img, + .thirteen img { + filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } - .logo img { - filter: invert(1); +} + +@keyframes rotate { + from { + transform: rotate(360deg); + } + to { + transform: rotate(0deg); } } diff --git a/packages/create-next-app/templates/default/js/styles/globals.css b/packages/create-next-app/templates/default/js/styles/globals.css index 4f1842163d2220c..c183def8b534c5a 100644 --- a/packages/create-next-app/templates/default/js/styles/globals.css +++ b/packages/create-next-app/templates/default/js/styles/globals.css @@ -1,9 +1,95 @@ -html, -body { +:root { + --max-width: 1100px; + --border-radius: 12px; + + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; + + --primary-glow: conic-gradient( + from 180deg at 50% 50%, + #16abff33 0deg, + #0885ff33 55deg, + #54d6ff33 120deg, + #0071ff33 160deg, + transparent 360deg + ); + --secondary-glow: radial-gradient( + rgba(255, 255, 255, 1), + rgba(255, 255, 255, 0) + ); + + --tile-start-rgb: 239, 245, 249; + --tile-end-rgb: 228, 232, 233; + --tile-border: conic-gradient( + #00000080, + #00000040, + #00000030, + #00000020, + #00000010, + #00000010, + #00000080 + ); + + --callout-rgb: 238, 240, 241; + --callout-border-rgb: 172, 175, 176; + --card-rgb: 180, 185, 188; + --card-border-rgb: 131, 134, 135; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + + --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); + --secondary-glow: linear-gradient( + to bottom right, + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0.3) + ); + + --tile-start-rgb: 2, 13, 46; + --tile-end-rgb: 2, 5, 19; + --tile-border: conic-gradient( + #ffffff80, + #ffffff40, + #ffffff30, + #ffffff20, + #ffffff10, + #ffffff10, + #ffffff80 + ); + + --callout-rgb: 20, 20, 20; + --callout-border-rgb: 108, 108, 108; + --card-rgb: 100, 100, 100; + --card-border-rgb: 200, 200, 200; + } +} + +* { + box-sizing: border-box; padding: 0; margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; +} + +html, +body { + max-width: 100vw; + overflow-x: hidden; +} + +body { + color: rbg(--foreground-rgb); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); } a { @@ -11,16 +97,8 @@ a { text-decoration: none; } -* { - box-sizing: border-box; -} - @media (prefers-color-scheme: dark) { html { color-scheme: dark; } - body { - color: white; - background: black; - } } diff --git a/packages/create-next-app/templates/default/ts/gitignore b/packages/create-next-app/templates/default/ts/gitignore index c87c9b392c0200d..46f26a804bbe1c3 100644 --- a/packages/create-next-app/templates/default/ts/gitignore +++ b/packages/create-next-app/templates/default/ts/gitignore @@ -33,4 +33,4 @@ yarn-error.log* # typescript *.tsbuildinfo -next-env.d.ts +next-env.d.ts \ No newline at end of file diff --git a/packages/create-next-app/templates/default/ts/pages/_document.tsx b/packages/create-next-app/templates/default/ts/pages/_document.tsx new file mode 100644 index 000000000000000..54e8bf3e2a29015 --- /dev/null +++ b/packages/create-next-app/templates/default/ts/pages/_document.tsx @@ -0,0 +1,13 @@ +import { Html, Head, Main, NextScript } from 'next/document' + +export default function Document() { + return ( + + + +
+ + + + ) +} diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index cdffa57ca82541a..581ccee9bfae4cc 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -1,43 +1,119 @@ import Head from 'next/head' import Image from 'next/image' +import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' import styles from '../styles/Home.module.css' +const inter = Inter({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceGrotesk = Space_Grotesk({ + subsets: ['latin'], + fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], +}) + +const spaceMono = Space_Mono({ + weight: ['400', '700'], + subsets: ['latin'], + variable: '--font-mono', + fallback: ['ui-monospace', 'monospace'], +}) + export default function Home() { return ( -
+ <> Create Next App + +
+
+

+ Get started by editing  + pages/index.tsx +

+ +
-
-

- Welcome to Next.js! -

- -

- Get started by editing{' '} - pages/index.tsx -

+
+
+ Next.js Logo +
+
+ 13 +
+
-
- - -
+
+ ) } diff --git a/packages/create-next-app/templates/default/ts/public/next.svg b/packages/create-next-app/templates/default/ts/public/next.svg new file mode 100644 index 000000000000000..5174b28c565c285 --- /dev/null +++ b/packages/create-next-app/templates/default/ts/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/ts/public/thirteen.svg b/packages/create-next-app/templates/default/ts/public/thirteen.svg new file mode 100644 index 000000000000000..8977c1bd123cbe4 --- /dev/null +++ b/packages/create-next-app/templates/default/ts/public/thirteen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/ts/public/vercel.svg b/packages/create-next-app/templates/default/ts/public/vercel.svg index fbf0e25a651c289..d2f84222734f27b 100644 --- a/packages/create-next-app/templates/default/ts/public/vercel.svg +++ b/packages/create-next-app/templates/default/ts/public/vercel.svg @@ -1,4 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index bd50f42ffe6a26e..cf6bb4b891a9c2f 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -1,129 +1,297 @@ -.container { - padding: 0 2rem; -} - -.main { - min-height: 100vh; - padding: 4rem 0; - flex: 1; +.content { display: flex; - flex-direction: column; - justify-content: center; + flex-flow: column; + justify-content: space-between; align-items: center; + padding: 6rem; + min-height: 100vh; } -.footer { - display: flex; - flex: 1; - padding: 2rem 0; - border-top: 1px solid #eaeaea; - justify-content: center; - align-items: center; +.description { + display: inherit; + justify-content: inherit; + align-items: inherit; + text-align: center; + font-size: 0.9rem; + max-width: var(--max-width); + width: 100%; } -.footer a { +.description a { display: flex; - justify-content: center; align-items: center; - flex-grow: 1; + justify-content: center; + line-height: 1.5rem; } -.title a { - color: #0070f3; - text-decoration: none; +.description p { + position: relative; + margin: 0; + padding: 0.8rem 1rem 0.9rem; + background-color: rgba(var(--callout-rgb), 0.5); + border: 1px solid rgba(var(--callout-border-rgb), 0.3); + border-radius: var(--border-radius); + z-index: 1; } -.title a:hover, -.title a:focus, -.title a:active { - text-decoration: underline; +.code { + font-weight: 700; + font-family: var(--font-mono); } -.title { - margin: 0; - line-height: 1.15; - font-size: 4rem; +.grid { + display: grid; + grid-template-columns: repeat(4, minmax(25%, auto)); + width: var(--max-width); + max-width: 100%; } -.title, -.description { - text-align: center; +.card { + padding: 1rem 1.2rem; + border-radius: var(--border-radius); + background: rgba(var(--card-rgb), 0); + border: 1px solid rgba(var(--card-border-rgb), 0); + transition: background 200ms, border 200ms; } -.description { - margin: 4rem 0; - line-height: 1.5; - font-size: 1.5rem; +.card span { + display: inline-block; + transform: translateX(0); + transition: transform 200ms; } -.code { - background: #fafafa; - border-radius: 5px; - padding: 0.75rem; - font-size: 1.1rem; - font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, - Bitstream Vera Sans Mono, Courier New, monospace; +.card h2 { + font-weight: 600; + margin: 0 0 0.7rem 0; } -.grid { +.card p { + margin: 0; + opacity: 0.6; + font-size: 0.9rem; + line-height: 125%; + max-width: 32ch; + letter-spacing: -0.01em; +} + +.vercel-logo { + height: 1.5rem; + margin-left: 0.5rem; +} + +.center { display: flex; + justify-content: center; align-items: center; + box-sizing: content-box; + position: relative; + width: 100vw; + padding: 4rem 0; + flex-grow: 1; +} + +.center::before { + background: var(--secondary-glow); + border-radius: 50%; + width: 480px; + height: 360px; + left: 50%; + margin-left: -400px; +} + +.center::after { + left: 50%; + background: var(--primary-glow); + width: 240px; + height: 180px; + z-index: -1; +} + +.center::before, +.center::after { + content: ''; + position: absolute; + filter: blur(45px); + transform: translateZ(0); +} + +.logo, +.thirteen { + position: relative; +} + +.thirteen { + display: flex; justify-content: center; - flex-wrap: wrap; - max-width: 800px; + align-items: center; + width: 75px; + height: 75px; + padding: 25px 10px; + margin-left: 16px; + transform: translateZ(0); + border-radius: var(--border-radius); + overflow: hidden; + box-shadow: 0px 2px 8px -1px #0000001a; } -.card { - margin: 1rem; - padding: 1.5rem; - text-align: left; - color: inherit; - text-decoration: none; - border: 1px solid #eaeaea; - border-radius: 10px; - transition: color 0.15s ease, border-color 0.15s ease; - max-width: 300px; +.thirteen img { + z-index: 1; } -.card:hover, -.card:focus, -.card:active { - color: #0070f3; - border-color: #0070f3; +/* Conic Gradient Animation */ +.thirteen::before { + content: ''; + position: absolute; + animation: 6s rotate 1s linear infinite; + z-index: -1; + width: 200%; + height: 200%; + background: var(--tile-border); } -.card h2 { - margin: 0 0 1rem 0; - font-size: 1.5rem; +/* Inner Square */ +.thirteen::after { + content: ''; + position: absolute; + inset: 0; + padding: 1px; + border-radius: var(--border-radius); + background: linear-gradient( + to bottom right, + rgba(var(--tile-start-rgb), 1), + rgba(var(--tile-end-rgb), 1) + ); + background-clip: content-box; + z-index: 0; } -.card p { - margin: 0; - font-size: 1.25rem; - line-height: 1.5; +/* Enable hover only on non-touch devices */ +@media (hover: hover) and (pointer: fine) { + .card:hover { + background: rgba(var(--card-rgb), 0.1); + border: 1px solid rgba(var(--card-border-rgb), 0.15); + } + + .card:hover span { + transform: translateX(4px); + transition: transform 200ms; + } } -.logo { - height: 1em; - margin-left: 0.5rem; +@media (prefers-reduced-motion) { + .thirteen::before { + animation: none; + } } -@media (max-width: 600px) { +/* Mobile */ +@media (max-width: 700px) { + .content { + padding: 4rem; + } + .grid { - width: 100%; + grid-template-columns: 1fr; flex-direction: column; + margin-bottom: 120px; + max-width: 320px; + text-align: center; + } + + .card { + padding-left: 40px; + padding-right: 40px; + } + + .card h2 { + margin: 0 0 0.5rem 0; + } + + .center { + padding: 8rem 0 6rem; + } + + .center::before { + transform: none; + width: 100vw; + height: 300px; + } + + .description p, + .description a { + font-size: 0.8rem; + padding: 1rem; + width: 100%; + } + + .description p { + position: fixed; + top: 0; + left: 0; + right: 0; + display: flex; + align-items: center; + justify-content: center; + inset: 0 0 auto; + width: 100vw; + padding: 2rem 1rem 1.4rem; + border-radius: 0; + border: none; + border-bottom: 1px solid rgba(var(--callout-border-rgb), 0.25); + background: linear-gradient( + to bottom, + rgba(var(--background-start-rgb), 1), + rgba(var(--callout-rgb), 0.5) + ); + background-clip: padding-box; + backdrop-filter: blur(24px); + } + + .description div { + display: flex; + align-items: flex-end; + justify-content: center; + position: fixed; + pointer-events: none; + left: 0; + bottom: 0; + padding: 2rem; + height: 200px; + width: 100%; + background: linear-gradient( + to bottom, + transparent 0%, + rgb(var(--background-end-rgb)) 40% + ); + z-index: 1; + } +} + +/* Tablet and Smaller Desktop */ +@media (min-width: 701px) and (max-width: 1120px) { + .grid { + gap: 0; + grid-template-columns: repeat(2, 50%); + width: 100%; } } @media (prefers-color-scheme: dark) { - .card, - .footer { - border-color: #222; + .vercel-logo img { + filter: invert(1); } - .code { - background: #111; + + .logo img, + .thirteen img { + filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } - .logo img { - filter: invert(1); +} + +@keyframes rotate { + from { + transform: rotate(360deg); + } + to { + transform: rotate(0deg); } } diff --git a/packages/create-next-app/templates/default/ts/styles/globals.css b/packages/create-next-app/templates/default/ts/styles/globals.css index 4f1842163d2220c..c183def8b534c5a 100644 --- a/packages/create-next-app/templates/default/ts/styles/globals.css +++ b/packages/create-next-app/templates/default/ts/styles/globals.css @@ -1,9 +1,95 @@ -html, -body { +:root { + --max-width: 1100px; + --border-radius: 12px; + + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; + + --primary-glow: conic-gradient( + from 180deg at 50% 50%, + #16abff33 0deg, + #0885ff33 55deg, + #54d6ff33 120deg, + #0071ff33 160deg, + transparent 360deg + ); + --secondary-glow: radial-gradient( + rgba(255, 255, 255, 1), + rgba(255, 255, 255, 0) + ); + + --tile-start-rgb: 239, 245, 249; + --tile-end-rgb: 228, 232, 233; + --tile-border: conic-gradient( + #00000080, + #00000040, + #00000030, + #00000020, + #00000010, + #00000010, + #00000080 + ); + + --callout-rgb: 238, 240, 241; + --callout-border-rgb: 172, 175, 176; + --card-rgb: 180, 185, 188; + --card-border-rgb: 131, 134, 135; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + + --primary-glow: radial-gradient(rgba(1, 65, 255, 0.4), rgba(1, 65, 255, 0)); + --secondary-glow: linear-gradient( + to bottom right, + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0), + rgba(1, 65, 255, 0.3) + ); + + --tile-start-rgb: 2, 13, 46; + --tile-end-rgb: 2, 5, 19; + --tile-border: conic-gradient( + #ffffff80, + #ffffff40, + #ffffff30, + #ffffff20, + #ffffff10, + #ffffff10, + #ffffff80 + ); + + --callout-rgb: 20, 20, 20; + --callout-border-rgb: 108, 108, 108; + --card-rgb: 100, 100, 100; + --card-border-rgb: 200, 200, 200; + } +} + +* { + box-sizing: border-box; padding: 0; margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, - Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; +} + +html, +body { + max-width: 100vw; + overflow-x: hidden; +} + +body { + color: rbg(--foreground-rgb); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); } a { @@ -11,16 +97,8 @@ a { text-decoration: none; } -* { - box-sizing: border-box; -} - @media (prefers-color-scheme: dark) { html { color-scheme: dark; } - body { - color: white; - background: black; - } } diff --git a/packages/create-next-app/templates/index.ts b/packages/create-next-app/templates/index.ts index 0863fc87f46cb73..7545c29d9788dd6 100644 --- a/packages/create-next-app/templates/index.ts +++ b/packages/create-next-app/templates/index.ts @@ -62,7 +62,7 @@ export const installTemplate = async ({ /** * Default dependencies. */ - const dependencies = ['react', 'react-dom', 'next'] + const dependencies = ['react', 'react-dom', 'next', '@next/font'] /** * TypeScript projects will have type definitions and other devDependencies. */ @@ -99,6 +99,7 @@ export const installTemplate = async ({ */ console.log('\nInitializing project with template:', template, '\n') const templatePath = path.join(__dirname, template, mode) + console.log(templatePath) await cpy('**', root, { parents: true, cwd: templatePath, From 1994163bb8bb6612b045579d0c3bbccb0dd80bb3 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 14:39:14 -0800 Subject: [PATCH 02/19] clean up --- packages/create-next-app/templates/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create-next-app/templates/index.ts b/packages/create-next-app/templates/index.ts index 7545c29d9788dd6..77cb9bd06664247 100644 --- a/packages/create-next-app/templates/index.ts +++ b/packages/create-next-app/templates/index.ts @@ -99,7 +99,6 @@ export const installTemplate = async ({ */ console.log('\nInitializing project with template:', template, '\n') const templatePath = path.join(__dirname, template, mode) - console.log(templatePath) await cpy('**', root, { parents: true, cwd: templatePath, From e2bc04a0e09fc65fa21f8b683695e71ea6e1ae63 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 14:42:12 -0800 Subject: [PATCH 03/19] clean up /app --- .../templates/app/js/app/page.jsx | 184 +++++++++--------- .../templates/app/ts/app/page.tsx | 184 +++++++++--------- 2 files changed, 176 insertions(+), 192 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index cb1c7eac50a1fe5..c8a586d5d650d95 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -21,109 +21,101 @@ const spaceMono = Space_Mono({ export default function Home() { return ( - <> -
-
-

- Get started by editing  - pages/index.js -

- -
- -
-
- Next.js Logo -
-
- 13 -
-
- -
+ ) } diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index cb1c7eac50a1fe5..c8a586d5d650d95 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -21,109 +21,101 @@ const spaceMono = Space_Mono({ export default function Home() { return ( - <> -
-
-

- Get started by editing  - pages/index.js -

- -
- -
-
- Next.js Logo -
-
- 13 -
-
- -
+ ) } From f20e0781774399ca2aeda055ee18f1d5ad36de5f Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 14:50:53 -0800 Subject: [PATCH 04/19] fix gitignore format --- packages/create-next-app/templates/app/js/gitignore | 2 +- packages/create-next-app/templates/app/ts/gitignore | 8 ++++++-- packages/create-next-app/templates/default/js/gitignore | 2 +- packages/create-next-app/templates/default/ts/gitignore | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/create-next-app/templates/app/js/gitignore b/packages/create-next-app/templates/app/js/gitignore index 56cffa71ef6b6b4..55175ef867e0b00 100644 --- a/packages/create-next-app/templates/app/js/gitignore +++ b/packages/create-next-app/templates/app/js/gitignore @@ -29,4 +29,4 @@ yarn-error.log* .env*.local # vercel -.vercel \ No newline at end of file +.vercel diff --git a/packages/create-next-app/templates/app/ts/gitignore b/packages/create-next-app/templates/app/ts/gitignore index 56cffa71ef6b6b4..e2cbb48a25a6f3c 100644 --- a/packages/create-next-app/templates/app/ts/gitignore +++ b/packages/create-next-app/templates/app/ts/gitignore @@ -1,4 +1,4 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. +# See for more about ignoring files # dependencies /node_modules @@ -29,4 +29,8 @@ yarn-error.log* .env*.local # vercel -.vercel \ No newline at end of file +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/packages/create-next-app/templates/default/js/gitignore b/packages/create-next-app/templates/default/js/gitignore index 56cffa71ef6b6b4..55175ef867e0b00 100644 --- a/packages/create-next-app/templates/default/js/gitignore +++ b/packages/create-next-app/templates/default/js/gitignore @@ -29,4 +29,4 @@ yarn-error.log* .env*.local # vercel -.vercel \ No newline at end of file +.vercel diff --git a/packages/create-next-app/templates/default/ts/gitignore b/packages/create-next-app/templates/default/ts/gitignore index 46f26a804bbe1c3..c87c9b392c0200d 100644 --- a/packages/create-next-app/templates/default/ts/gitignore +++ b/packages/create-next-app/templates/default/ts/gitignore @@ -33,4 +33,4 @@ yarn-error.log* # typescript *.tsbuildinfo -next-env.d.ts \ No newline at end of file +next-env.d.ts From 3578f41c9ba12d92f1362816e06cae1ac866e00c Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 15:07:08 -0800 Subject: [PATCH 05/19] fix small typos --- packages/create-next-app/templates/app/js/app/page.module.css | 2 +- packages/create-next-app/templates/app/ts/app/layout.tsx | 2 +- packages/create-next-app/templates/app/ts/app/page.module.css | 2 +- packages/create-next-app/templates/app/ts/gitignore | 2 +- .../create-next-app/templates/default/js/styles/Home.module.css | 2 +- .../create-next-app/templates/default/ts/styles/Home.module.css | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index cf6bb4b891a9c2f..db81083eae53d84 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -1,6 +1,6 @@ .content { display: flex; - flex-flow: column; + flex-direction: column; justify-content: space-between; align-items: center; padding: 6rem; diff --git a/packages/create-next-app/templates/app/ts/app/layout.tsx b/packages/create-next-app/templates/app/ts/app/layout.tsx index df5100c220621de..245bd756ae580f7 100644 --- a/packages/create-next-app/templates/app/ts/app/layout.tsx +++ b/packages/create-next-app/templates/app/ts/app/layout.tsx @@ -9,7 +9,7 @@ export default function RootLayout({ {/* will contain the components returned by the nearest parent - head.jsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head + head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head */} {children} diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index cf6bb4b891a9c2f..db81083eae53d84 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -1,6 +1,6 @@ .content { display: flex; - flex-flow: column; + flex-direction: column; justify-content: space-between; align-items: center; padding: 6rem; diff --git a/packages/create-next-app/templates/app/ts/gitignore b/packages/create-next-app/templates/app/ts/gitignore index e2cbb48a25a6f3c..c87c9b392c0200d 100644 --- a/packages/create-next-app/templates/app/ts/gitignore +++ b/packages/create-next-app/templates/app/ts/gitignore @@ -1,4 +1,4 @@ -# See for more about ignoring files +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies /node_modules diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index cf6bb4b891a9c2f..db81083eae53d84 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -1,6 +1,6 @@ .content { display: flex; - flex-flow: column; + flex-direction: column; justify-content: space-between; align-items: center; padding: 6rem; diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index cf6bb4b891a9c2f..db81083eae53d84 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -1,6 +1,6 @@ .content { display: flex; - flex-flow: column; + flex-direction: column; justify-content: space-between; align-items: center; padding: 6rem; From 7098a176586d8266df69fcb75a7420c887fafa7d Mon Sep 17 00:00:00 2001 From: jueungrace Date: Mon, 28 Nov 2022 17:50:09 -0800 Subject: [PATCH 06/19] add next/font to test deps --- test/integration/create-next-app/lib/specification.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/integration/create-next-app/lib/specification.ts b/test/integration/create-next-app/lib/specification.ts index dbdfd610aab0922..ea529cabe9aec18 100644 --- a/test/integration/create-next-app/lib/specification.ts +++ b/test/integration/create-next-app/lib/specification.ts @@ -28,7 +28,14 @@ export const projectSpecification: ProjectSpecification = { 'node_modules/next', '.gitignore', ], - deps: ['next', 'react', 'react-dom', 'eslint', 'eslint-config-next'], + deps: [ + 'next', + '@next/font', + 'react', + 'react-dom', + 'eslint', + 'eslint-config-next', + ], devDeps: [], }, default: { From fbc9857421a6de7c666dad178665191e498e8271 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 09:10:34 -0800 Subject: [PATCH 07/19] code clean up - emil --- .../templates/app/js/app/page.jsx | 37 +++++++++---------- .../templates/app/js/app/page.module.css | 31 ++++++---------- .../templates/app/ts/app/page.module.css | 31 ++++++---------- .../templates/app/ts/app/page.tsx | 37 +++++++++---------- .../templates/default/js/pages/index.js | 37 +++++++++---------- .../default/js/styles/Home.module.css | 31 ++++++---------- .../templates/default/ts/pages/index.tsx | 37 +++++++++---------- .../default/ts/styles/Home.module.css | 31 ++++++---------- 8 files changed, 112 insertions(+), 160 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index c8a586d5d650d95..16d2df010ce4bde 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -21,7 +21,7 @@ const spaceMono = Space_Mono({ export default function Home() { return ( -
+

Get started by editing  @@ -35,29 +35,26 @@ export default function Home() { rel="noopener noreferrer" > By{' '} - - Vercel Logo - + Vercel Logo

-
- Next.js Logo -
+ Next.js Logo
13
@@ -116,6 +113,6 @@ export default function Home() {

-
+
) } diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index db81083eae53d84..c4f9843c40aaa9a 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -11,17 +11,17 @@ display: inherit; justify-content: inherit; align-items: inherit; - text-align: center; font-size: 0.9rem; max-width: var(--max-width); width: 100%; + z-index: 10; } .description a { display: flex; align-items: center; justify-content: center; - line-height: 1.5rem; + gap: 0.5rem; } .description p { @@ -31,7 +31,6 @@ background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); - z-index: 1; } .code { @@ -56,7 +55,6 @@ .card span { display: inline-block; - transform: translateX(0); transition: transform 200ms; } @@ -69,25 +67,17 @@ margin: 0; opacity: 0.6; font-size: 0.9rem; - line-height: 125%; + line-height: 1.25; max-width: 32ch; letter-spacing: -0.01em; } -.vercel-logo { - height: 1.5rem; - margin-left: 0.5rem; -} - .center { display: flex; justify-content: center; align-items: center; - box-sizing: content-box; position: relative; - width: 100vw; padding: 4rem 0; - flex-grow: 1; } .center::before { @@ -162,7 +152,7 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: 0; + z-index: -1; } /* Enable hover only on non-touch devices */ @@ -174,7 +164,6 @@ .card:hover span { transform: translateX(4px); - transition: transform 200ms; } } @@ -182,6 +171,10 @@ .thirteen::before { animation: none; } + + .card:hover span { + transform: none; + } } /* Mobile */ @@ -192,7 +185,6 @@ .grid { grid-template-columns: 1fr; - flex-direction: column; margin-bottom: 120px; max-width: 320px; text-align: center; @@ -204,7 +196,7 @@ } .card h2 { - margin: 0 0 0.5rem 0; + margin-bottom: 0.5rem; } .center { @@ -213,7 +205,6 @@ .center::before { transform: none; - width: 100vw; height: 300px; } @@ -233,7 +224,7 @@ align-items: center; justify-content: center; inset: 0 0 auto; - width: 100vw; + width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -277,7 +268,7 @@ } @media (prefers-color-scheme: dark) { - .vercel-logo img { + .vercelLogo { filter: invert(1); } diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index db81083eae53d84..c4f9843c40aaa9a 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -11,17 +11,17 @@ display: inherit; justify-content: inherit; align-items: inherit; - text-align: center; font-size: 0.9rem; max-width: var(--max-width); width: 100%; + z-index: 10; } .description a { display: flex; align-items: center; justify-content: center; - line-height: 1.5rem; + gap: 0.5rem; } .description p { @@ -31,7 +31,6 @@ background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); - z-index: 1; } .code { @@ -56,7 +55,6 @@ .card span { display: inline-block; - transform: translateX(0); transition: transform 200ms; } @@ -69,25 +67,17 @@ margin: 0; opacity: 0.6; font-size: 0.9rem; - line-height: 125%; + line-height: 1.25; max-width: 32ch; letter-spacing: -0.01em; } -.vercel-logo { - height: 1.5rem; - margin-left: 0.5rem; -} - .center { display: flex; justify-content: center; align-items: center; - box-sizing: content-box; position: relative; - width: 100vw; padding: 4rem 0; - flex-grow: 1; } .center::before { @@ -162,7 +152,7 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: 0; + z-index: -1; } /* Enable hover only on non-touch devices */ @@ -174,7 +164,6 @@ .card:hover span { transform: translateX(4px); - transition: transform 200ms; } } @@ -182,6 +171,10 @@ .thirteen::before { animation: none; } + + .card:hover span { + transform: none; + } } /* Mobile */ @@ -192,7 +185,6 @@ .grid { grid-template-columns: 1fr; - flex-direction: column; margin-bottom: 120px; max-width: 320px; text-align: center; @@ -204,7 +196,7 @@ } .card h2 { - margin: 0 0 0.5rem 0; + margin-bottom: 0.5rem; } .center { @@ -213,7 +205,6 @@ .center::before { transform: none; - width: 100vw; height: 300px; } @@ -233,7 +224,7 @@ align-items: center; justify-content: center; inset: 0 0 auto; - width: 100vw; + width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -277,7 +268,7 @@ } @media (prefers-color-scheme: dark) { - .vercel-logo img { + .vercelLogo { filter: invert(1); } diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index c8a586d5d650d95..16d2df010ce4bde 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -21,7 +21,7 @@ const spaceMono = Space_Mono({ export default function Home() { return ( -
+

Get started by editing  @@ -35,29 +35,26 @@ export default function Home() { rel="noopener noreferrer" > By{' '} - - Vercel Logo - + Vercel Logo

-
- Next.js Logo -
+ Next.js Logo
13
@@ -116,6 +113,6 @@ export default function Home() {

- +
) } diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 66f86dc61de5553..4085ff8b3bcc9f4 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -29,7 +29,7 @@ export default function Home() { -
+

Get started by editing  @@ -43,29 +43,26 @@ export default function Home() { rel="noopener noreferrer" > By{' '} - - Vercel Logo - + Vercel Logo

-
- Next.js Logo -
+ Next.js Logo
-
+ ) } diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index db81083eae53d84..c4f9843c40aaa9a 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -11,17 +11,17 @@ display: inherit; justify-content: inherit; align-items: inherit; - text-align: center; font-size: 0.9rem; max-width: var(--max-width); width: 100%; + z-index: 10; } .description a { display: flex; align-items: center; justify-content: center; - line-height: 1.5rem; + gap: 0.5rem; } .description p { @@ -31,7 +31,6 @@ background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); - z-index: 1; } .code { @@ -56,7 +55,6 @@ .card span { display: inline-block; - transform: translateX(0); transition: transform 200ms; } @@ -69,25 +67,17 @@ margin: 0; opacity: 0.6; font-size: 0.9rem; - line-height: 125%; + line-height: 1.25; max-width: 32ch; letter-spacing: -0.01em; } -.vercel-logo { - height: 1.5rem; - margin-left: 0.5rem; -} - .center { display: flex; justify-content: center; align-items: center; - box-sizing: content-box; position: relative; - width: 100vw; padding: 4rem 0; - flex-grow: 1; } .center::before { @@ -162,7 +152,7 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: 0; + z-index: -1; } /* Enable hover only on non-touch devices */ @@ -174,7 +164,6 @@ .card:hover span { transform: translateX(4px); - transition: transform 200ms; } } @@ -182,6 +171,10 @@ .thirteen::before { animation: none; } + + .card:hover span { + transform: none; + } } /* Mobile */ @@ -192,7 +185,6 @@ .grid { grid-template-columns: 1fr; - flex-direction: column; margin-bottom: 120px; max-width: 320px; text-align: center; @@ -204,7 +196,7 @@ } .card h2 { - margin: 0 0 0.5rem 0; + margin-bottom: 0.5rem; } .center { @@ -213,7 +205,6 @@ .center::before { transform: none; - width: 100vw; height: 300px; } @@ -233,7 +224,7 @@ align-items: center; justify-content: center; inset: 0 0 auto; - width: 100vw; + width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -277,7 +268,7 @@ } @media (prefers-color-scheme: dark) { - .vercel-logo img { + .vercelLogo { filter: invert(1); } diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index 581ccee9bfae4cc..d87c1fad39ea1fa 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -29,7 +29,7 @@ export default function Home() { -
+

Get started by editing  @@ -43,29 +43,26 @@ export default function Home() { rel="noopener noreferrer" > By{' '} - - Vercel Logo - + Vercel Logo

-
- Next.js Logo -
+ Next.js Logo
-
+ ) } diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index db81083eae53d84..c4f9843c40aaa9a 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -11,17 +11,17 @@ display: inherit; justify-content: inherit; align-items: inherit; - text-align: center; font-size: 0.9rem; max-width: var(--max-width); width: 100%; + z-index: 10; } .description a { display: flex; align-items: center; justify-content: center; - line-height: 1.5rem; + gap: 0.5rem; } .description p { @@ -31,7 +31,6 @@ background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); - z-index: 1; } .code { @@ -56,7 +55,6 @@ .card span { display: inline-block; - transform: translateX(0); transition: transform 200ms; } @@ -69,25 +67,17 @@ margin: 0; opacity: 0.6; font-size: 0.9rem; - line-height: 125%; + line-height: 1.25; max-width: 32ch; letter-spacing: -0.01em; } -.vercel-logo { - height: 1.5rem; - margin-left: 0.5rem; -} - .center { display: flex; justify-content: center; align-items: center; - box-sizing: content-box; position: relative; - width: 100vw; padding: 4rem 0; - flex-grow: 1; } .center::before { @@ -162,7 +152,7 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: 0; + z-index: -1; } /* Enable hover only on non-touch devices */ @@ -174,7 +164,6 @@ .card:hover span { transform: translateX(4px); - transition: transform 200ms; } } @@ -182,6 +171,10 @@ .thirteen::before { animation: none; } + + .card:hover span { + transform: none; + } } /* Mobile */ @@ -192,7 +185,6 @@ .grid { grid-template-columns: 1fr; - flex-direction: column; margin-bottom: 120px; max-width: 320px; text-align: center; @@ -204,7 +196,7 @@ } .card h2 { - margin: 0 0 0.5rem 0; + margin-bottom: 0.5rem; } .center { @@ -213,7 +205,6 @@ .center::before { transform: none; - width: 100vw; height: 300px; } @@ -233,7 +224,7 @@ align-items: center; justify-content: center; inset: 0 0 auto; - width: 100vw; + width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -277,7 +268,7 @@ } @media (prefers-color-scheme: dark) { - .vercel-logo img { + .vercelLogo { filter: invert(1); } From 99c872de3a507ce43fbcd3e728176f6a540efebf Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 13:21:03 -0800 Subject: [PATCH 08/19] default template css clean up --- .../templates/app/js/app/page.jsx | 32 ++++++----------- .../templates/app/js/app/page.module.css | 34 +++++-------------- .../templates/app/ts/app/page.module.css | 34 +++++-------------- .../templates/app/ts/app/page.tsx | 32 ++++++----------- .../default/js/styles/Home.module.css | 23 ++++--------- .../default/ts/styles/Home.module.css | 21 +++--------- 6 files changed, 47 insertions(+), 129 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 16d2df010ce4bde..f4e1bbca8a0ec2d 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -25,14 +25,14 @@ export default function Home() {

Get started by editing  - pages/index.js + app/page.jsx

By{' '}

Docs -> @@ -74,33 +76,19 @@ export default function Home() { -

- Learn -> -

-

- Learn about Next.js in an interactive course with quizzes! -

-
- -

- Templates -> + Examples ->

- Discover and deploy boilerplate example Next.js projects. + Explore the Next.js 13 playground.

Get started by editing  - pages/index.js + app/page.tsx

By{' '}

Docs -> @@ -74,33 +76,19 @@ export default function Home() { -

- Learn -> -

-

- Learn about Next.js in an interactive course with quizzes! -

-
- -

- Templates -> + Examples ->

- Discover and deploy boilerplate example Next.js projects. + Explore the Next.js 13 playground.

Date: Tue, 29 Nov 2022 13:33:12 -0800 Subject: [PATCH 09/19] css clean up --- .../create-next-app/templates/default/ts/styles/Home.module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index 018f45c269cc4d1..59d0afcf57315eb 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -19,8 +19,8 @@ .description a { display: flex; - align-items: center; justify-content: center; + align-items: center; gap: 0.5rem; } From 68fe2df743a74fae84f721e909c69dc696fd5716 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 13:39:09 -0800 Subject: [PATCH 10/19] add target blank to links --- .../create-next-app/templates/app/js/app/page.jsx | 4 +++- .../create-next-app/templates/app/ts/app/page.tsx | 6 ++++-- .../templates/default/js/pages/index.js | 12 ++++++++---- .../templates/default/ts/pages/index.tsx | 12 ++++++++---- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index f4e1bbca8a0ec2d..8ac2093c7d1e4bd 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -78,6 +78,8 @@ export default function Home() {

Examples -> @@ -89,9 +91,9 @@ export default function Home() {

Deploy -> diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 13e15164e339d5d..0a70d6d5a67fe83 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -78,6 +78,8 @@ export default function Home() {

Examples -> @@ -89,9 +91,9 @@ export default function Home() {

Deploy -> diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 4085ff8b3bcc9f4..3af9ba2f6ebfa3d 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -40,7 +40,7 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" target="_blank" - rel="noopener noreferrer" + rel="noopener" > By{' '}

Docs -> @@ -91,7 +93,7 @@ export default function Home() { href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener noreferrer" + rel="noopener" >

Learn -> @@ -104,6 +106,8 @@ export default function Home() {

Templates -> @@ -115,9 +119,9 @@ export default function Home() {

Deploy -> diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index d87c1fad39ea1fa..3cd998aeab248ad 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -40,7 +40,7 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" target="_blank" - rel="noopener noreferrer" + rel="noopener" > By{' '}

Docs -> @@ -91,7 +93,7 @@ export default function Home() { href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener noreferrer" + rel="noopener" >

Learn -> @@ -104,6 +106,8 @@ export default function Home() {

Templates -> @@ -115,9 +119,9 @@ export default function Home() {

Deploy -> From 2cb592967ccc143acfc7c6b7d387841e4120d59e Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 13:58:46 -0800 Subject: [PATCH 11/19] logo invert bug --- packages/create-next-app/templates/app/js/app/page.module.css | 2 +- packages/create-next-app/templates/app/ts/app/page.module.css | 2 +- .../create-next-app/templates/default/js/styles/Home.module.css | 2 +- .../create-next-app/templates/default/ts/styles/Home.module.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index 225d3055ebec7fc..dbf5161c9b98fc2 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -254,7 +254,7 @@ filter: invert(1); } - .logo img, + .logo, .thirteen img { filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index 225d3055ebec7fc..dbf5161c9b98fc2 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -254,7 +254,7 @@ filter: invert(1); } - .logo img, + .logo, .thirteen img { filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index 59d0afcf57315eb..49ac5abb866522d 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -261,7 +261,7 @@ filter: invert(1); } - .logo img, + .logo, .thirteen img { filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index 59d0afcf57315eb..49ac5abb866522d 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -261,7 +261,7 @@ filter: invert(1); } - .logo img, + .logo, .thirteen img { filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70); } From 3e9e6ecf0f8ad1a84c67d06b13540e08306c32ec Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 14:34:06 -0800 Subject: [PATCH 12/19] add noreferrer rel attr --- .../create-next-app/templates/app/js/app/page.jsx | 7 ++++--- .../create-next-app/templates/app/ts/app/page.tsx | 9 +++++---- .../templates/default/js/pages/index.js | 11 ++++++----- .../templates/default/ts/pages/index.tsx | 11 ++++++----- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 8ac2093c7d1e4bd..098f59bbd881666 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -32,12 +32,13 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app" target="_blank" - rel="noopener" + rel="noopener noreferrer" > By{' '} Vercel Logo

Docs -> @@ -79,7 +80,7 @@ export default function Home() { href="https://vercel.com/templates/next.js/app-directory?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Examples -> diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 0a70d6d5a67fe83..818c9b6f6d7abf6 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -32,12 +32,13 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app" target="_blank" - rel="noopener" + rel="noopener noreferrer" > By{' '} Vercel Logo

Docs -> @@ -79,7 +80,7 @@ export default function Home() { href="https://vercel.com/templates/next.js/app-directory?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Examples -> @@ -93,7 +94,7 @@ export default function Home() { href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Deploy -> diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 3af9ba2f6ebfa3d..a84176dd7da5caa 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -40,12 +40,13 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" target="_blank" - rel="noopener" + rel="noopener noreferrer" > By{' '} Vercel Logo

Docs -> @@ -93,7 +94,7 @@ export default function Home() { href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Learn -> @@ -107,7 +108,7 @@ export default function Home() { href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Templates -> @@ -121,7 +122,7 @@ export default function Home() { href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Deploy -> diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index 3cd998aeab248ad..b691e7a537cb0a4 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -40,12 +40,13 @@ export default function Home() { className={spaceMono.className} href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" target="_blank" - rel="noopener" + rel="noopener noreferrer" > By{' '} Vercel Logo

Docs -> @@ -93,7 +94,7 @@ export default function Home() { href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Learn -> @@ -107,7 +108,7 @@ export default function Home() { href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Templates -> @@ -121,7 +122,7 @@ export default function Home() { href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app" className={styles.card} target="_blank" - rel="noopener" + rel="noopener noreferrer" >

Deploy -> From 8dffc74ff6dc7b1bb9434c133b241c09530742d7 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 15:05:30 -0800 Subject: [PATCH 13/19] update copy to Templates --- packages/create-next-app/templates/app/js/app/page.jsx | 2 +- packages/create-next-app/templates/app/ts/app/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 098f59bbd881666..0cb379e1bff0259 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -83,7 +83,7 @@ export default function Home() { rel="noopener noreferrer" >

- Examples -> + Templates ->

Explore the Next.js 13 playground. diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 818c9b6f6d7abf6..f03e6c2ae8c049d 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -83,7 +83,7 @@ export default function Home() { rel="noopener noreferrer" >

- Examples -> + Templates ->

Explore the Next.js 13 playground. From f25f18711143c31e6241bdfdc617f335dc0d16c8 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 15:07:28 -0800 Subject: [PATCH 14/19] Update classname to main --- packages/create-next-app/templates/app/js/app/page.jsx | 2 +- packages/create-next-app/templates/app/js/app/page.module.css | 2 +- packages/create-next-app/templates/app/ts/app/page.module.css | 2 +- packages/create-next-app/templates/app/ts/app/page.tsx | 2 +- packages/create-next-app/templates/default/js/pages/index.js | 2 +- .../create-next-app/templates/default/js/styles/Home.module.css | 2 +- packages/create-next-app/templates/default/ts/pages/index.tsx | 2 +- .../create-next-app/templates/default/ts/styles/Home.module.css | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 0cb379e1bff0259..4ae614c73e03e8e 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -21,7 +21,7 @@ const spaceMono = Space_Mono({ export default function Home() { return ( -

+

Get started by editing  diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index dbf5161c9b98fc2..17c7e58b538fbdc 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -1,4 +1,4 @@ -.content { +.main { display: flex; flex-direction: column; justify-content: space-between; diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index dbf5161c9b98fc2..17c7e58b538fbdc 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -1,4 +1,4 @@ -.content { +.main { display: flex; flex-direction: column; justify-content: space-between; diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index f03e6c2ae8c049d..5cc7fc6d8e23427 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -21,7 +21,7 @@ const spaceMono = Space_Mono({ export default function Home() { return ( -

+

Get started by editing  diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index a84176dd7da5caa..02befd86425eb7c 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -29,7 +29,7 @@ export default function Home() { -

+

Get started by editing  diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index 49ac5abb866522d..888c267cc4d30eb 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -1,4 +1,4 @@ -.content { +.main { display: flex; flex-direction: column; justify-content: space-between; diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index b691e7a537cb0a4..152a3bf906a5684 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -29,7 +29,7 @@ export default function Home() { -

+

Get started by editing  diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index 49ac5abb866522d..888c267cc4d30eb 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -1,4 +1,4 @@ -.content { +.main { display: flex; flex-direction: column; justify-content: space-between; From 1a2d6412de11655a799c123c1e392981921989a5 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Tue, 29 Nov 2022 15:35:03 -0800 Subject: [PATCH 15/19] combine reused styles --- .../templates/app/js/app/page.module.css | 37 ++++++++++--------- .../templates/app/ts/app/page.module.css | 37 ++++++++++--------- .../default/js/styles/Home.module.css | 37 ++++++++++--------- .../default/ts/styles/Home.module.css | 37 ++++++++++--------- 4 files changed, 76 insertions(+), 72 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index 17c7e58b538fbdc..af018d2f5778a27 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -85,12 +85,10 @@ border-radius: 50%; width: 480px; height: 360px; - left: 50%; margin-left: -400px; } .center::after { - left: 50%; background: var(--primary-glow); width: 240px; height: 180px; @@ -100,6 +98,7 @@ .center::before, .center::after { content: ''; + left: 50%; position: absolute; filter: blur(45px); transform: translateZ(0); @@ -124,12 +123,16 @@ box-shadow: 0px 2px 8px -1px #0000001a; } -/* Conic Gradient Animation */ -.thirteen::before { +.thirteen::before, +.thirteen::after { content: ''; position: absolute; - animation: 6s rotate linear infinite; z-index: -1; +} + +/* Conic Gradient Animation */ +.thirteen::before { + animation: 6s rotate linear infinite; width: 200%; height: 200%; background: var(--tile-border); @@ -137,8 +140,6 @@ /* Inner Square */ .thirteen::after { - content: ''; - position: absolute; inset: 0; padding: 1px; border-radius: var(--border-radius); @@ -148,7 +149,6 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: -1; } /* Enable hover only on non-touch devices */ @@ -203,20 +203,25 @@ height: 300px; } - .description p, - .description a { + .description { font-size: 0.8rem; + } + + .description a { padding: 1rem; + } + + .description p, + .description div { + display: flex; + justify-content: center; + position: fixed; width: 100%; } .description p { - position: fixed; - display: flex; align-items: center; - justify-content: center; inset: 0 0 auto; - width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -231,15 +236,11 @@ } .description div { - display: flex; align-items: flex-end; - justify-content: center; - position: fixed; pointer-events: none; inset: auto 0 0; padding: 2rem; height: 200px; - width: 100%; background: linear-gradient( to bottom, transparent 0%, diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index 17c7e58b538fbdc..af018d2f5778a27 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -85,12 +85,10 @@ border-radius: 50%; width: 480px; height: 360px; - left: 50%; margin-left: -400px; } .center::after { - left: 50%; background: var(--primary-glow); width: 240px; height: 180px; @@ -100,6 +98,7 @@ .center::before, .center::after { content: ''; + left: 50%; position: absolute; filter: blur(45px); transform: translateZ(0); @@ -124,12 +123,16 @@ box-shadow: 0px 2px 8px -1px #0000001a; } -/* Conic Gradient Animation */ -.thirteen::before { +.thirteen::before, +.thirteen::after { content: ''; position: absolute; - animation: 6s rotate linear infinite; z-index: -1; +} + +/* Conic Gradient Animation */ +.thirteen::before { + animation: 6s rotate linear infinite; width: 200%; height: 200%; background: var(--tile-border); @@ -137,8 +140,6 @@ /* Inner Square */ .thirteen::after { - content: ''; - position: absolute; inset: 0; padding: 1px; border-radius: var(--border-radius); @@ -148,7 +149,6 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: -1; } /* Enable hover only on non-touch devices */ @@ -203,20 +203,25 @@ height: 300px; } - .description p, - .description a { + .description { font-size: 0.8rem; + } + + .description a { padding: 1rem; + } + + .description p, + .description div { + display: flex; + justify-content: center; + position: fixed; width: 100%; } .description p { - position: fixed; - display: flex; align-items: center; - justify-content: center; inset: 0 0 auto; - width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -231,15 +236,11 @@ } .description div { - display: flex; align-items: flex-end; - justify-content: center; - position: fixed; pointer-events: none; inset: auto 0 0; padding: 2rem; height: 200px; - width: 100%; background: linear-gradient( to bottom, transparent 0%, diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index 888c267cc4d30eb..6a830b87d068fd1 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -85,12 +85,10 @@ border-radius: 50%; width: 480px; height: 360px; - left: 50%; margin-left: -400px; } .center::after { - left: 50%; background: var(--primary-glow); width: 240px; height: 180px; @@ -100,6 +98,7 @@ .center::before, .center::after { content: ''; + left: 50%; position: absolute; filter: blur(45px); transform: translateZ(0); @@ -124,12 +123,16 @@ box-shadow: 0px 2px 8px -1px #0000001a; } -/* Conic Gradient Animation */ -.thirteen::before { +.thirteen::before, +.thirteen::after { content: ''; position: absolute; - animation: 6s rotate linear infinite; z-index: -1; +} + +/* Conic Gradient Animation */ +.thirteen::before { + animation: 6s rotate linear infinite; width: 200%; height: 200%; background: var(--tile-border); @@ -137,8 +140,6 @@ /* Inner Square */ .thirteen::after { - content: ''; - position: absolute; inset: 0; padding: 1px; border-radius: var(--border-radius); @@ -148,7 +149,6 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: -1; } /* Enable hover only on non-touch devices */ @@ -203,20 +203,25 @@ height: 300px; } - .description p, - .description a { + .description { font-size: 0.8rem; + } + + .description a { padding: 1rem; + } + + .description p, + .description div { + display: flex; + justify-content: center; + position: fixed; width: 100%; } .description p { - position: fixed; - display: flex; align-items: center; - justify-content: center; inset: 0 0 auto; - width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -231,15 +236,11 @@ } .description div { - display: flex; align-items: flex-end; - justify-content: center; - position: fixed; pointer-events: none; inset: auto 0 0; padding: 2rem; height: 200px; - width: 100%; background: linear-gradient( to bottom, transparent 0%, diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index 888c267cc4d30eb..6a830b87d068fd1 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -85,12 +85,10 @@ border-radius: 50%; width: 480px; height: 360px; - left: 50%; margin-left: -400px; } .center::after { - left: 50%; background: var(--primary-glow); width: 240px; height: 180px; @@ -100,6 +98,7 @@ .center::before, .center::after { content: ''; + left: 50%; position: absolute; filter: blur(45px); transform: translateZ(0); @@ -124,12 +123,16 @@ box-shadow: 0px 2px 8px -1px #0000001a; } -/* Conic Gradient Animation */ -.thirteen::before { +.thirteen::before, +.thirteen::after { content: ''; position: absolute; - animation: 6s rotate linear infinite; z-index: -1; +} + +/* Conic Gradient Animation */ +.thirteen::before { + animation: 6s rotate linear infinite; width: 200%; height: 200%; background: var(--tile-border); @@ -137,8 +140,6 @@ /* Inner Square */ .thirteen::after { - content: ''; - position: absolute; inset: 0; padding: 1px; border-radius: var(--border-radius); @@ -148,7 +149,6 @@ rgba(var(--tile-end-rgb), 1) ); background-clip: content-box; - z-index: -1; } /* Enable hover only on non-touch devices */ @@ -203,20 +203,25 @@ height: 300px; } - .description p, - .description a { + .description { font-size: 0.8rem; + } + + .description a { padding: 1rem; + } + + .description p, + .description div { + display: flex; + justify-content: center; + position: fixed; width: 100%; } .description p { - position: fixed; - display: flex; align-items: center; - justify-content: center; inset: 0 0 auto; - width: 100%; padding: 2rem 1rem 1.4rem; border-radius: 0; border: none; @@ -231,15 +236,11 @@ } .description div { - display: flex; align-items: flex-end; - justify-content: center; - position: fixed; pointer-events: none; inset: auto 0 0; padding: 2rem; height: 200px; - width: 100%; background: linear-gradient( to bottom, transparent 0%, From 549ec85c7f254cb9e2adf273f4b483b7213ea98e Mon Sep 17 00:00:00 2001 From: jueungrace Date: Wed, 30 Nov 2022 09:37:13 -0800 Subject: [PATCH 16/19] Update appdir templates link to marketplace --- packages/create-next-app/templates/app/js/app/page.jsx | 2 +- packages/create-next-app/templates/app/ts/app/page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 4ae614c73e03e8e..f2547955ad6d42c 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -77,7 +77,7 @@ export default function Home() { Date: Wed, 30 Nov 2022 15:13:06 -0800 Subject: [PATCH 17/19] Reduce font use in /pages --- .../templates/default/js/pages/index.js | 39 ++++++------------- .../default/js/styles/Home.module.css | 14 ++++--- .../templates/default/js/styles/globals.css | 3 ++ .../templates/default/ts/pages/index.tsx | 39 ++++++------------- .../default/ts/styles/Home.module.css | 14 ++++--- .../templates/default/ts/styles/globals.css | 3 ++ 6 files changed, 46 insertions(+), 66 deletions(-) diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 02befd86425eb7c..932452dde70c43b 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -1,24 +1,9 @@ import Head from 'next/head' import Image from 'next/image' -import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' +import { Inter } from '@next/font/google' import styles from '../styles/Home.module.css' -const inter = Inter({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceGrotesk = Space_Grotesk({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceMono = Space_Mono({ - weight: ['400', '700'], - subsets: ['latin'], - variable: '--font-mono', - fallback: ['ui-monospace', 'monospace'], -}) +const inter = Inter({ subsets: ['latin'] }) export default function Home() { return ( @@ -31,13 +16,12 @@ export default function Home() {

-

- Find in-depth information about Next.js features and API. +

+ Find in-depth information about Next.js features and API.

@@ -99,8 +83,8 @@ export default function Home() {

Learn ->

-

- Learn about Next.js in an interactive course with quizzes! +

+ Learn about Next.js in an interactive course with quizzes!

@@ -113,8 +97,8 @@ export default function Home() {

Templates ->

-

- Discover and deploy boilerplate example Next.js projects. +

+ Discover and deploy boilerplate example Next.js projects.

@@ -127,8 +111,9 @@ export default function Home() {

Deploy ->

-

- Instantly deploy your Next.js site to a shareable URL with Vercel. +

+ Instantly deploy your Next.js site to a shareable URL + with Vercel.

diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index 6a830b87d068fd1..b868a36feeec1bc 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -11,10 +11,11 @@ display: inherit; justify-content: inherit; align-items: inherit; - font-size: 0.9rem; + font-size: 0.85rem; max-width: var(--max-width); width: 100%; z-index: 2; + font-family: var(--font-mono); } .description a { @@ -27,7 +28,7 @@ .description p { position: relative; margin: 0; - padding: 0.8rem 1rem 0.9rem; + padding: 1rem; background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); @@ -66,10 +67,11 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.9rem; - line-height: 1.25; - max-width: 32ch; - letter-spacing: -0.01em; + font-size: 0.8rem; + line-height: 1.5; + max-width: 30ch; + word-spacing: -0.1rem; + font-family: var(--font-mono); } .center { diff --git a/packages/create-next-app/templates/default/js/styles/globals.css b/packages/create-next-app/templates/default/js/styles/globals.css index c183def8b534c5a..3a54ccd80be4277 100644 --- a/packages/create-next-app/templates/default/js/styles/globals.css +++ b/packages/create-next-app/templates/default/js/styles/globals.css @@ -1,6 +1,9 @@ :root { --max-width: 1100px; --border-radius: 12px; + --font-mono: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', + 'Roboto Mono', 'Oxygen Mono', 'Ubuntu Monospace', 'Source Code Pro', + 'Fira Mono', 'Droid Sans Mono', 'Courier New', monospace; --foreground-rgb: 0, 0, 0; --background-start-rgb: 214, 219, 220; diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index 152a3bf906a5684..ba681c5734ec9ca 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -1,24 +1,9 @@ import Head from 'next/head' import Image from 'next/image' -import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' +import { Inter } from '@next/font/google' import styles from '../styles/Home.module.css' -const inter = Inter({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceGrotesk = Space_Grotesk({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceMono = Space_Mono({ - weight: ['400', '700'], - subsets: ['latin'], - variable: '--font-mono', - fallback: ['ui-monospace', 'monospace'], -}) +const inter = Inter({ subsets: ['latin'] }) export default function Home() { return ( @@ -31,13 +16,12 @@ export default function Home() {
-

+

Get started by editing  pages/index.tsx

-

- Find in-depth information about Next.js features and API. +

+ Find in-depth information about Next.js features and API.

@@ -99,8 +83,8 @@ export default function Home() {

Learn ->

-

- Learn about Next.js in an interactive course with quizzes! +

+ Learn about Next.js in an interactive course with quizzes!

@@ -113,8 +97,8 @@ export default function Home() {

Templates ->

-

- Discover and deploy boilerplate example Next.js projects. +

+ Discover and deploy boilerplate example Next.js projects.

@@ -127,8 +111,9 @@ export default function Home() {

Deploy ->

-

- Instantly deploy your Next.js site to a shareable URL with Vercel. +

+ Instantly deploy your Next.js site to a shareable URL + with Vercel.

diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index 6a830b87d068fd1..b868a36feeec1bc 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -11,10 +11,11 @@ display: inherit; justify-content: inherit; align-items: inherit; - font-size: 0.9rem; + font-size: 0.85rem; max-width: var(--max-width); width: 100%; z-index: 2; + font-family: var(--font-mono); } .description a { @@ -27,7 +28,7 @@ .description p { position: relative; margin: 0; - padding: 0.8rem 1rem 0.9rem; + padding: 1rem; background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); @@ -66,10 +67,11 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.9rem; - line-height: 1.25; - max-width: 32ch; - letter-spacing: -0.01em; + font-size: 0.8rem; + line-height: 1.5; + max-width: 30ch; + word-spacing: -0.1rem; + font-family: var(--font-mono); } .center { diff --git a/packages/create-next-app/templates/default/ts/styles/globals.css b/packages/create-next-app/templates/default/ts/styles/globals.css index c183def8b534c5a..3a54ccd80be4277 100644 --- a/packages/create-next-app/templates/default/ts/styles/globals.css +++ b/packages/create-next-app/templates/default/ts/styles/globals.css @@ -1,6 +1,9 @@ :root { --max-width: 1100px; --border-radius: 12px; + --font-mono: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', + 'Roboto Mono', 'Oxygen Mono', 'Ubuntu Monospace', 'Source Code Pro', + 'Fira Mono', 'Droid Sans Mono', 'Courier New', monospace; --foreground-rgb: 0, 0, 0; --background-start-rgb: 214, 219, 220; From 919a1e9d39bcc9c735a56d7ec40ed0af04666776 Mon Sep 17 00:00:00 2001 From: jueungrace Date: Wed, 30 Nov 2022 15:21:09 -0800 Subject: [PATCH 18/19] Appdir remove custom mono fonts --- .../templates/app/js/app/globals.css | 3 ++ .../templates/app/js/app/page.jsx | 34 ++++--------------- .../templates/app/js/app/page.module.css | 13 +++---- .../templates/app/ts/app/globals.css | 3 ++ .../templates/app/ts/app/page.module.css | 13 +++---- .../templates/app/ts/app/page.tsx | 34 ++++--------------- 6 files changed, 34 insertions(+), 66 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/globals.css b/packages/create-next-app/templates/app/js/app/globals.css index c183def8b534c5a..3a54ccd80be4277 100644 --- a/packages/create-next-app/templates/app/js/app/globals.css +++ b/packages/create-next-app/templates/app/js/app/globals.css @@ -1,6 +1,9 @@ :root { --max-width: 1100px; --border-radius: 12px; + --font-mono: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', + 'Roboto Mono', 'Oxygen Mono', 'Ubuntu Monospace', 'Source Code Pro', + 'Fira Mono', 'Droid Sans Mono', 'Courier New', monospace; --foreground-rgb: 0, 0, 0; --background-start-rgb: 214, 219, 220; diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index f2547955ad6d42c..99132270a879ece 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -1,35 +1,19 @@ import Image from 'next/image' -import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' +import { Inter } from '@next/font/google' import styles from './page.module.css' -const inter = Inter({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceGrotesk = Space_Grotesk({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceMono = Space_Mono({ - weight: ['400', '700'], - subsets: ['latin'], - variable: '--font-mono', - fallback: ['ui-monospace', 'monospace'], -}) +const inter = Inter({ subsets: ['latin'] }) export default function Home() { return (
-

+

Get started by editing  app/page.jsx

Docs -> -

- Find in-depth information about Next.js features and API. -

+

Find in-depth information about Next.js features and API.

Templates -> -

- Explore the Next.js 13 playground. -

+

Explore the Next.js 13 playground.

Deploy -> -

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index af018d2f5778a27..c20cf88d360e271 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -11,10 +11,11 @@ display: inherit; justify-content: inherit; align-items: inherit; - font-size: 0.9rem; + font-size: 0.85rem; max-width: var(--max-width); width: 100%; z-index: 2; + font-family: var(--font-mono); } .description a { @@ -27,7 +28,7 @@ .description p { position: relative; margin: 0; - padding: 0.8rem 1rem 0.9rem; + padding: 1rem; background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); @@ -66,10 +67,10 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.9rem; - line-height: 1.25; - max-width: 32ch; - letter-spacing: -0.01em; + font-size: 0.8rem; + line-height: 1.5; + word-spacing: -0.1rem; + font-family: var(--font-mono); } .center { diff --git a/packages/create-next-app/templates/app/ts/app/globals.css b/packages/create-next-app/templates/app/ts/app/globals.css index c183def8b534c5a..3a54ccd80be4277 100644 --- a/packages/create-next-app/templates/app/ts/app/globals.css +++ b/packages/create-next-app/templates/app/ts/app/globals.css @@ -1,6 +1,9 @@ :root { --max-width: 1100px; --border-radius: 12px; + --font-mono: ui-monospace, Menlo, Monaco, 'Cascadia Mono', 'Segoe UI Mono', + 'Roboto Mono', 'Oxygen Mono', 'Ubuntu Monospace', 'Source Code Pro', + 'Fira Mono', 'Droid Sans Mono', 'Courier New', monospace; --foreground-rgb: 0, 0, 0; --background-start-rgb: 214, 219, 220; diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index af018d2f5778a27..c20cf88d360e271 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -11,10 +11,11 @@ display: inherit; justify-content: inherit; align-items: inherit; - font-size: 0.9rem; + font-size: 0.85rem; max-width: var(--max-width); width: 100%; z-index: 2; + font-family: var(--font-mono); } .description a { @@ -27,7 +28,7 @@ .description p { position: relative; margin: 0; - padding: 0.8rem 1rem 0.9rem; + padding: 1rem; background-color: rgba(var(--callout-rgb), 0.5); border: 1px solid rgba(var(--callout-border-rgb), 0.3); border-radius: var(--border-radius); @@ -66,10 +67,10 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.9rem; - line-height: 1.25; - max-width: 32ch; - letter-spacing: -0.01em; + font-size: 0.8rem; + line-height: 1.5; + word-spacing: -0.1rem; + font-family: var(--font-mono); } .center { diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index 08677612dcec63a..df74c142dd2de7d 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -1,35 +1,19 @@ import Image from 'next/image' -import { Inter, Space_Grotesk, Space_Mono } from '@next/font/google' +import { Inter } from '@next/font/google' import styles from './page.module.css' -const inter = Inter({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceGrotesk = Space_Grotesk({ - subsets: ['latin'], - fallback: ['system-ui', '-apple-system', 'Arial', 'sans-serif'], -}) - -const spaceMono = Space_Mono({ - weight: ['400', '700'], - subsets: ['latin'], - variable: '--font-mono', - fallback: ['ui-monospace', 'monospace'], -}) +const inter = Inter({ subsets: ['latin'] }) export default function Home() { return (
-

+

Get started by editing  app/page.tsx

Docs -> -

- Find in-depth information about Next.js features and API. -

+

Find in-depth information about Next.js features and API.

Templates -> -

- Explore the Next.js 13 playground. -

+

Explore the Next.js 13 playground.

Deploy -> -

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

From 7681c0bb9cdd82246e74bdca48e1123720d6c76e Mon Sep 17 00:00:00 2001 From: jueungrace Date: Wed, 30 Nov 2022 16:38:51 -0800 Subject: [PATCH 19/19] Change p font to Inter --- packages/create-next-app/templates/app/js/app/page.jsx | 8 +++++--- .../create-next-app/templates/app/js/app/page.module.css | 5 ++--- .../create-next-app/templates/app/ts/app/page.module.css | 5 ++--- packages/create-next-app/templates/app/ts/app/page.tsx | 8 +++++--- .../create-next-app/templates/default/js/pages/index.js | 8 ++++---- .../templates/default/js/styles/Home.module.css | 4 +--- .../create-next-app/templates/default/ts/pages/index.tsx | 8 ++++---- .../templates/default/ts/styles/Home.module.css | 4 +--- 8 files changed, 24 insertions(+), 26 deletions(-) diff --git a/packages/create-next-app/templates/app/js/app/page.jsx b/packages/create-next-app/templates/app/js/app/page.jsx index 99132270a879ece..ca2f14fe4230be9 100644 --- a/packages/create-next-app/templates/app/js/app/page.jsx +++ b/packages/create-next-app/templates/app/js/app/page.jsx @@ -55,7 +55,9 @@ export default function Home() {

Docs ->

-

Find in-depth information about Next.js features and API.

+

+ Find in-depth information about Next.js features and API. +

Templates -> -

Explore the Next.js 13 playground.

+

Explore the Next.js 13 playground.

Deploy -> -

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/app/js/app/page.module.css b/packages/create-next-app/templates/app/js/app/page.module.css index c20cf88d360e271..4732b55fdc23708 100644 --- a/packages/create-next-app/templates/app/js/app/page.module.css +++ b/packages/create-next-app/templates/app/js/app/page.module.css @@ -67,10 +67,9 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.8rem; + font-size: 0.9rem; line-height: 1.5; - word-spacing: -0.1rem; - font-family: var(--font-mono); + max-width: 34ch; } .center { diff --git a/packages/create-next-app/templates/app/ts/app/page.module.css b/packages/create-next-app/templates/app/ts/app/page.module.css index c20cf88d360e271..4732b55fdc23708 100644 --- a/packages/create-next-app/templates/app/ts/app/page.module.css +++ b/packages/create-next-app/templates/app/ts/app/page.module.css @@ -67,10 +67,9 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.8rem; + font-size: 0.9rem; line-height: 1.5; - word-spacing: -0.1rem; - font-family: var(--font-mono); + max-width: 34ch; } .center { diff --git a/packages/create-next-app/templates/app/ts/app/page.tsx b/packages/create-next-app/templates/app/ts/app/page.tsx index df74c142dd2de7d..47fcc959cf52b13 100644 --- a/packages/create-next-app/templates/app/ts/app/page.tsx +++ b/packages/create-next-app/templates/app/ts/app/page.tsx @@ -55,7 +55,9 @@ export default function Home() {

Docs ->

-

Find in-depth information about Next.js features and API.

+

+ Find in-depth information about Next.js features and API. +

Templates -> -

Explore the Next.js 13 playground.

+

Explore the Next.js 13 playground.

Deploy -> -

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default/js/pages/index.js b/packages/create-next-app/templates/default/js/pages/index.js index 932452dde70c43b..dc5a1cce79a7da7 100644 --- a/packages/create-next-app/templates/default/js/pages/index.js +++ b/packages/create-next-app/templates/default/js/pages/index.js @@ -69,7 +69,7 @@ export default function Home() {

Docs ->

-

+

Find in-depth information about Next.js features and API.

@@ -83,7 +83,7 @@ export default function Home() {

Learn ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -97,7 +97,7 @@ export default function Home() {

Templates ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -111,7 +111,7 @@ export default function Home() {

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default/js/styles/Home.module.css b/packages/create-next-app/templates/default/js/styles/Home.module.css index b868a36feeec1bc..27dfff5ec4cf882 100644 --- a/packages/create-next-app/templates/default/js/styles/Home.module.css +++ b/packages/create-next-app/templates/default/js/styles/Home.module.css @@ -67,11 +67,9 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.8rem; + font-size: 0.9rem; line-height: 1.5; max-width: 30ch; - word-spacing: -0.1rem; - font-family: var(--font-mono); } .center { diff --git a/packages/create-next-app/templates/default/ts/pages/index.tsx b/packages/create-next-app/templates/default/ts/pages/index.tsx index ba681c5734ec9ca..c08b1b34a0f94ac 100644 --- a/packages/create-next-app/templates/default/ts/pages/index.tsx +++ b/packages/create-next-app/templates/default/ts/pages/index.tsx @@ -69,7 +69,7 @@ export default function Home() {

Docs ->

-

+

Find in-depth information about Next.js features and API.

@@ -83,7 +83,7 @@ export default function Home() {

Learn ->

-

+

Learn about Next.js in an interactive course with quizzes!

@@ -97,7 +97,7 @@ export default function Home() {

Templates ->

-

+

Discover and deploy boilerplate example Next.js projects.

@@ -111,7 +111,7 @@ export default function Home() {

Deploy ->

-

+

Instantly deploy your Next.js site to a shareable URL with Vercel.

diff --git a/packages/create-next-app/templates/default/ts/styles/Home.module.css b/packages/create-next-app/templates/default/ts/styles/Home.module.css index b868a36feeec1bc..27dfff5ec4cf882 100644 --- a/packages/create-next-app/templates/default/ts/styles/Home.module.css +++ b/packages/create-next-app/templates/default/ts/styles/Home.module.css @@ -67,11 +67,9 @@ .card p { margin: 0; opacity: 0.6; - font-size: 0.8rem; + font-size: 0.9rem; line-height: 1.5; max-width: 30ch; - word-spacing: -0.1rem; - font-family: var(--font-mono); } .center {