diff --git a/docs/components/Header.tsx b/docs/components/Header.tsx index 98a16c7acab..cc64ef54d59 100644 --- a/docs/components/Header.tsx +++ b/docs/components/Header.tsx @@ -294,18 +294,23 @@ export function Header() { // yoo hooo loadSearch(searchAttempt); // search - keyboard shortcut - let keysPressed = {}; + let keysPressed: { [key: KeyboardEvent['key']]: boolean } = {}; document.body.addEventListener('keydown', event => { - // @ts-ignore + // If we're typing in an input, don't ever focus the search input + if ( + document.activeElement && + ['TEXTAREA', 'INPUT'].includes(document.activeElement.nodeName) + ) { + return; + } + keysPressed[event.key] = true; - // @ts-ignore if (keysPressed['Meta'] && event.key == 'k') { event.preventDefault(); document.getElementById('search-field')?.focus(); } }); document.body.addEventListener('keyup', event => { - // @ts-ignore delete keysPressed[event.key]; }); }, []); diff --git a/docs/components/MobileMenu.tsx b/docs/components/MobileMenu.tsx index a374d17bcf0..7675ffb2ad4 100644 --- a/docs/components/MobileMenu.tsx +++ b/docs/components/MobileMenu.tsx @@ -49,6 +49,7 @@ export function MobileMenu({ handleClose }: MobileMenuProps) { For Developers For Organisations For Content Management + For Enterprise
diff --git a/docs/components/icons/DFATLogo.tsx b/docs/components/icons/DFATLogo.tsx index 089eea3362f..83e06d7ac55 100644 --- a/docs/components/icons/DFATLogo.tsx +++ b/docs/components/icons/DFATLogo.tsx @@ -8,47 +8,48 @@ export function DFATLogo(props: IconProps) { return ( + diff --git a/docs/components/icons/EnliticLogo.tsx b/docs/components/icons/EnliticLogo.tsx index d345c7b5f11..e7f8f03c2fc 100644 --- a/docs/components/icons/EnliticLogo.tsx +++ b/docs/components/icons/EnliticLogo.tsx @@ -15,9 +15,10 @@ export function EnliticLogo(props: IconProps) { aria-label="Enlitic logo" {...props} > + ); diff --git a/docs/components/icons/PrintBarLogo.tsx b/docs/components/icons/PrintBarLogo.tsx index f49955898b7..1f758dff5bb 100644 --- a/docs/components/icons/PrintBarLogo.tsx +++ b/docs/components/icons/PrintBarLogo.tsx @@ -15,18 +15,26 @@ export function PrintBarLogo(props: IconProps) { aria-label="The Print Bar logo" {...props} > - - - + + + + + + + + + + + ); } diff --git a/docs/components/icons/RugbyAuLogo.tsx b/docs/components/icons/RugbyAuLogo.tsx index 415e63e1d5b..fbfb33919d2 100644 --- a/docs/components/icons/RugbyAuLogo.tsx +++ b/docs/components/icons/RugbyAuLogo.tsx @@ -15,11 +15,27 @@ export function RugbyAuLogo(props: IconProps) { aria-label="Rugby Australia logo" {...props} > - - + + + + + + + + + + + + + + + ); } diff --git a/docs/components/icons/VocalLogo.tsx b/docs/components/icons/VocalLogo.tsx index 453f6dba924..2cb96545f0f 100644 --- a/docs/components/icons/VocalLogo.tsx +++ b/docs/components/icons/VocalLogo.tsx @@ -15,13 +15,18 @@ export function VocalLogo(props: IconProps) { aria-label="Vocal logo" {...props} > + ); diff --git a/docs/pages/enterprise.tsx b/docs/pages/enterprise.tsx index b45e90a997c..a2aad4fdf10 100644 --- a/docs/pages/enterprise.tsx +++ b/docs/pages/enterprise.tsx @@ -1,6 +1,7 @@ /** @jsxRuntime classic */ /** @jsx jsx */ import { jsx } from '@emotion/react'; +import Link from 'next/link'; import { useMediaQuery } from '../lib/media'; import { Highlight } from '../components/primitives/Highlight'; import { MWrapper } from '../components/content/MWrapper'; @@ -18,43 +19,46 @@ import { RugbyAuLogo } from '../components/icons/RugbyAuLogo'; import { WestpacLogo } from '../components/icons/WestpacLogo'; import { PrintBarLogo } from '../components/icons/PrintBarLogo'; import { IntroHeading, IntroLead, IntroWrapper } from '../components/content/Intro'; +import { Stack } from '../components/primitives/Stack'; const customers = [ { icon: VocalLogo, title: 'Vocal', - copy: 'Large scale creator and content platform on web and mobile.', + copy: 'Large scale platform for content creators.', + learnMoreHref: 'https://www.thinkmill.com.au/work/vocal', }, { icon: PJohnsonLogo, title: 'PJohnson Tailors', - copy: 'PJT’s custom order and production management system', + copy: 'Custom garment order & production management system.', }, { icon: DFATLogo, title: `Dep't of Foreign Affairs & Trade`, accessibleTitle: 'Department of Foreign Affairs and Trade', - copy: 'Australian Free Trade Agreements website', + copy: 'Australia’s Free Trade Agreements website.', }, { icon: EnliticLogo, title: 'Enlitic', - copy: 'Powering Enlitic’s Medical Annotation Platform and PACS.', + copy: 'Medical Annotation Platform & PACS.', + learnMoreHref: 'https://www.thinkmill.com.au/work/enlitic', }, { icon: RugbyAuLogo, title: 'Rugby Australia', - copy: 'The home of the latest Rugby news, teams, fixtures & results', + copy: 'Headless CMS to power Rugby’s many websites.', }, { icon: WestpacLogo, title: 'Westpac', - copy: 'Content management for Westpac’s GEL system', + copy: 'Content management for Westpac’s GEL Design System.', }, { icon: PrintBarLogo, title: 'The Print Bar', - copy: 'Powering The Print Bar’s custom design and ordering platform.', + copy: 'Application backend for a custom design and ordering plaform.', }, ]; @@ -87,7 +91,6 @@ export default function ForOrganisations() { display: 'flex', flexDirection: 'column', gap: '5rem', - alignItems: 'center', paddingTop: '5rem', })} > @@ -104,19 +107,34 @@ export default function ForOrganisations() {
    - {customers.map(({ icon, accessibleTitle, title, copy }) => ( + {customers.map(({ icon, accessibleTitle, title, copy, learnMoreHref }) => (
  • - {copy} + {learnMoreHref ? ( + + {copy} +
    + Learn more. +
    +     + ) : ( + copy + )}
    • ))} diff --git a/examples/nextjs-keystone-two-servers/nextjs-frontend/next-env.d.ts b/examples/nextjs-keystone-two-servers/nextjs-frontend/next-env.d.ts new file mode 100644 index 00000000000..4f11a03dc6c --- /dev/null +++ b/examples/nextjs-keystone-two-servers/nextjs-frontend/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information.