diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8af9d52179f..347a4e695ba 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -73,9 +73,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies run: yarn @@ -136,9 +136,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies run: yarn @@ -191,9 +191,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies run: yarn @@ -229,9 +229,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies run: yarn @@ -290,9 +290,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies if: needs.should_run_tests.outputs.shouldRunTests == 'true' @@ -340,9 +340,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies if: needs.should_run_tests.outputs.shouldRunTests == 'true' @@ -379,9 +379,9 @@ jobs: path: | ${{ steps.yarn-cache-dir-path.outputs.dir }} node_modules - key: ${{ runner.os }}-yarn-v4-${{ hashFiles('yarn.lock') }} + key: ${{ runner.os }}-yarn-v5-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{ runner.os }}-yarn-v4- + ${{ runner.os }}-yarn-v5- - name: Install Dependencies run: yarn diff --git a/docs/components/Announce.tsx b/docs/components/Announce.tsx index a1c01aca983..f8ea91d4e90 100644 --- a/docs/components/Announce.tsx +++ b/docs/components/Announce.tsx @@ -14,7 +14,11 @@ export function Announce({ children, ...props }: AnnounceProps) {
+ // {' '} + // + // Join us + // {' '} + // for our first Community Q&A next{' '} + // Tuesday Sep 21st @ 3–4pm AEST –{' '} + // + // Register now + // + // ! + // + // ); + // standard announcement return ( Keystone 6 is in Community Preview! For Keystone 5 docs @@ -131,9 +156,8 @@ export function DocsPage({ css={{ justifyContent: 'space-between', alignItems: 'baseline' }} > - {!isUpdatesPage && ( - - )} + + {children} diff --git a/docs/components/Socials.tsx b/docs/components/Socials.tsx index b2fc296ea22..8a6c2db7ed8 100644 --- a/docs/components/Socials.tsx +++ b/docs/components/Socials.tsx @@ -4,6 +4,7 @@ import { jsx } from '@emotion/react'; import { HTMLAttributes } from 'react'; import { Twitter } from './icons/Twitter'; +import { YouTube } from './icons/YouTube'; import { Slack } from './icons/Slack'; export function Socials(props: HTMLAttributes) { @@ -11,7 +12,7 @@ export function Socials(props: HTMLAttributes) {
) { > + + +
); } diff --git a/docs/components/docs/DocumentEditorDemo.tsx b/docs/components/docs/DocumentEditorDemo.tsx index badc2f18505..2d8f1197341 100644 --- a/docs/components/docs/DocumentEditorDemo.tsx +++ b/docs/components/docs/DocumentEditorDemo.tsx @@ -296,8 +296,9 @@ export const DocumentEditorDemo = () => { 'blockquote, p, pre': { marginTop: '1em', marginBottom: '1em', + lineHeight: 1.75, }, - 'h1,h2,h3,h4,h5,h6': { fontWeight: 'bold', margin: 0 }, + 'h1,h2,h3,h4,h5,h6': { fontWeight: 'bold', margin: 0, lineHeight: 1.75 }, h1: { fontSize: 'var(--font-xxlarge)' }, h2: { fontSize: 'var(--font-large)' }, h3: { fontSize: 'var(--font-medium)' }, @@ -305,6 +306,7 @@ export const DocumentEditorDemo = () => { h6: { fontSize: 'var(--font-xxsmall)' }, 'ul, ol': { paddingLeft: 40, + lineHeight: 1.75, }, }} > diff --git a/docs/components/docs/GitHubExamplesCTA.tsx b/docs/components/docs/GitHubExamplesCTA.tsx index 8ec3b47aac7..c72cb56e392 100644 --- a/docs/components/docs/GitHubExamplesCTA.tsx +++ b/docs/components/docs/GitHubExamplesCTA.tsx @@ -15,7 +15,7 @@ export function GitHubExamplesCTA() { margin: '0 1rem 0.5rem 0', }} > - See the full set of examples in our + All example projects live in the ); diff --git a/docs/components/docs/Keystone5DocsCTA.tsx b/docs/components/docs/Keystone5DocsCTA.tsx new file mode 100644 index 00000000000..7d422f19927 --- /dev/null +++ b/docs/components/docs/Keystone5DocsCTA.tsx @@ -0,0 +1,23 @@ +/** @jsxRuntime classic */ +/** @jsx jsx */ +import { jsx } from '@emotion/react'; + +import { Alert } from '../primitives/Alert'; + +export function Keystone5DocsCTA() { + return ( + + + Using Keystone 5? Find the docs at{' '} + + v5.keystonejs.com + + + + ); +} diff --git a/docs/components/docs/Navigation.tsx b/docs/components/docs/Navigation.tsx index d772d16be50..c7a827ece02 100644 --- a/docs/components/docs/Navigation.tsx +++ b/docs/components/docs/Navigation.tsx @@ -13,7 +13,7 @@ import { Badge } from '../primitives/Badge'; import { Type } from '../primitives/Type'; import { Emoji } from '../primitives/Emoji'; -type SectionProps = { label: string; children: ReactNode }; +type SectionProps = { label?: string; children: ReactNode }; export function Section({ label, children }: SectionProps) { return (
- - {label} - + {label && ( + + {label} + + )} {children}
); @@ -142,8 +144,14 @@ export function DocsNavigation() { > Docs Home Walkthroughs - Examples -
+
+ Examples + Basic + Feature + Deployment +
+
+ Guides Command Line Relationships @@ -180,7 +188,8 @@ export function DocsNavigation() { Custom Field Views
-
+
+ APIs Config Config API Schema API diff --git a/docs/components/icons/Bulb.tsx b/docs/components/icons/Bulb.tsx new file mode 100644 index 00000000000..7e8bc71364a --- /dev/null +++ b/docs/components/icons/Bulb.tsx @@ -0,0 +1,26 @@ +/** @jsx jsx */ +import { jsx } from '@emotion/react'; + +import { Gradients, IconProps } from './util'; + +export function Bulb({ grad, ...props }: IconProps) { + return ( + + + + + ); +} diff --git a/docs/components/icons/Question.tsx b/docs/components/icons/Question.tsx new file mode 100644 index 00000000000..846a0d61e35 --- /dev/null +++ b/docs/components/icons/Question.tsx @@ -0,0 +1,26 @@ +/** @jsx jsx */ +import { jsx } from '@emotion/react'; + +import { Gradients, IconProps } from './util'; + +export function Question({ grad, ...props }: IconProps) { + return ( + + + + + ); +} diff --git a/docs/components/icons/Video.tsx b/docs/components/icons/Video.tsx new file mode 100644 index 00000000000..af99fabc066 --- /dev/null +++ b/docs/components/icons/Video.tsx @@ -0,0 +1,26 @@ +/** @jsx jsx */ +import { jsx } from '@emotion/react'; + +import { Gradients, IconProps } from './util'; + +export function Video({ grad, ...props }: IconProps) { + return ( + + + + + ); +} diff --git a/docs/components/icons/YouTube.tsx b/docs/components/icons/YouTube.tsx new file mode 100644 index 00000000000..7909e10b4e0 --- /dev/null +++ b/docs/components/icons/YouTube.tsx @@ -0,0 +1,23 @@ +/** @jsxRuntime classic */ +/** @jsx jsx */ +import { jsx } from '@emotion/react'; + +import { Gradients, IconProps } from './util'; + +export function YouTube({ grad, ...props }: IconProps) { + return ( + + + + + ); +} diff --git a/docs/lib/TOKENS.ts b/docs/lib/TOKENS.ts index ebb9c446ce4..dcb6255365d 100644 --- a/docs/lib/TOKENS.ts +++ b/docs/lib/TOKENS.ts @@ -70,7 +70,7 @@ export const COLORS = { '--grad4-1': '#f87171', '--grad4-2': '#F68B27', '--grad5-1': '#EC4899', - '--grad5-2': '#F87171 ', + '--grad5-2': '#F87171', }, dark: { '--theme': 'dark', diff --git a/docs/pages/_document.tsx b/docs/pages/_document.tsx index e9192e8dc81..302120687c4 100644 --- a/docs/pages/_document.tsx +++ b/docs/pages/_document.tsx @@ -72,6 +72,7 @@ class MyDocument extends Document { async src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" /> +