Merge branch 'master' into update-validation-messages

keystonejs · Aug 1, 2021 · cc90f8a · cc90f8a
2 parents c979cd8 + 67807db
commit cc90f8a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/docs/components/docs/Navigation.tsx b/docs/components/docs/Navigation.tsx
@@ -207,13 +207,15 @@ export function UpdatesNavigation({ releases = [] }: { releases: string[] }) {
       <PrimaryNavItem href="/updates">Latest News</PrimaryNavItem>
       <PrimaryNavItem href="/updates/roadmap">Roadmap</PrimaryNavItem>
       <PrimaryNavItem href="/releases">Release Notes</PrimaryNavItem>
-      <Section label="Recent Releases">
-        {releases.map(name => (
-          <NavItem key={name} href={`/releases/${name}`}>
-            {format(parseISO(name), 'do LLL yyyy')}
-          </NavItem>
-        ))}
-      </Section>
+      {releases.length ? (
+        <Section label="Recent Releases">
+          {releases.map(name => (
+            <NavItem key={name} href={`/releases/${name}`}>
+              {format(parseISO(name), 'do LLL yyyy')}
+            </NavItem>
+          ))}
+        </Section>
+      ) : null}
     </nav>
   );
 }
diff --git a/docs/pages/docs/guides/custom-admin-ui-pages.mdx b/docs/pages/docs/guides/custom-admin-ui-pages.mdx
@@ -17,8 +17,10 @@ The default export of every file in this directory is expected to be a valid Rea
 // admin/pages/MyCustomPage.tsx
 export default function () {
     return (
-        <h1>This is a custom Admin UI Page</h1>
-        <p>It can be accessed via the route '/MyCustomPage'</p>
+        <>
+            <h1>This is a custom Admin UI Page</h1>
+            <p>It can be accessed via the route '/MyCustomPage'</p>
+        </>
     )
 }
 ```
@@ -32,10 +34,12 @@ If you have styling constraints, we recommend using the jsx export from the `@ke
 import { jsx } from '@keystone-ui/core';
 export default function () {
     return (
-        <h1 css={{
-            fontSize: '3rem'
-        }}>This is a custom Admin UI Page</h1>
-        <p>It can be accessed via the route '/MyCustomPage'</p>
+        <>
+            <h1 css={{
+                fontSize: '3rem'
+            }}>This is a custom Admin UI Page</h1>
+            <p>It can be accessed via the route '/MyCustomPage'</p>
+        </>
     )
 }
 ```

diff --git a/docs/pages/releases/2021-07-29.mdx b/docs/pages/releases/2021-07-29.mdx
@@ -96,5 +96,5 @@ Updated Prisma dependencies to `2.27.0`, check out the [Prisma releases page](ht
 
 You can also view the [verbose release notes](https://github.com/keystonejs/keystone/releases/tag/2021-07-29) on GitHub.
 
-export default ({ children, ...props }) => <Markdown {...props}>{children}</Markdown>;
+export default ({ children, ...props }) => <Markdown description="Custom navigation, pages and logo in this big Admin UI themed release!" {...props}>{children}</Markdown>;
 export { getServerSideProps }