From 9c3d26d689c6905cd304e9d2514731d425d411e5 Mon Sep 17 00:00:00 2001
From: Josep Martins <josepmartins@github.com>
Date: Thu, 20 Jul 2023 17:53:27 +0200
Subject: [PATCH 1/4] Moving header out of the nav

---
 theme/src/components/nav-items.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/theme/src/components/nav-items.js b/theme/src/components/nav-items.js
index 45fa2ef5..c33f9f51 100644
--- a/theme/src/components/nav-items.js
+++ b/theme/src/components/nav-items.js
@@ -31,10 +31,10 @@ function NavItem({href, children}) {
 function NavItems({items}) {
   return (
     <>
+      <VisuallyHidden>
+        <h3>Site navigation</h3>
+      </VisuallyHidden>
       <NavList aria-label="Site">
-        <VisuallyHidden>
-          <h3>Site navigation</h3>
-        </VisuallyHidden>
         {items.map(item => (
           <React.Fragment key={item.title}>
             {item.children ? (

From 6a000281275e641310988be7d66c07ef756e84c4 Mon Sep 17 00:00:00 2001
From: Josep Martins <josepmartins@github.com>
Date: Thu, 20 Jul 2023 18:01:47 +0200
Subject: [PATCH 2/4] Remove breadcrumb spacing

---
 theme/src/components/layout.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/theme/src/components/layout.js b/theme/src/components/layout.js
index 9013d271..deda2da5 100644
--- a/theme/src/components/layout.js
+++ b/theme/src/components/layout.js
@@ -107,15 +107,15 @@ function Layout({children, pageContext, path}) {
           ) : null}
           <Box sx={{width: '100%', maxWidth: '960px'}}>
             <Box as="main" id="skip-nav" sx={{mb: 4}}>
-              <Breadcrumbs sx={{mb: 4}}>
-                {breadcrumbData.length > 1
-                  ? breadcrumbData.map(item => (
-                      <Breadcrumbs.Item key={item.url} href={item.url} selected={path === item.url}>
-                        {item.title}
-                      </Breadcrumbs.Item>
-                    ))
-                  : null}
-              </Breadcrumbs>
+              {breadcrumbData.length > 1 ? (
+                <Breadcrumbs sx={{mb: 4}}>
+                  {breadcrumbData.map(item => (
+                    <Breadcrumbs.Item key={item.url} href={item.url} selected={path === item.url}>
+                      {item.title}
+                    </Breadcrumbs.Item>
+                  ))}
+                </Breadcrumbs>
+              ) : null}
               <Box sx={{alignItems: 'center', display: 'flex'}}>
                 <Heading as="h1" sx={{fontSize: 7}}>
                   {title}

From b9b0f8d562f71a259b0f30e7d6ecb25a1a0264f7 Mon Sep 17 00:00:00 2001
From: Josep Martins <josepmartins@github.com>
Date: Thu, 20 Jul 2023 18:17:12 +0200
Subject: [PATCH 3/4] Remove component area spacing

---
 theme/src/components/layout.js | 122 ++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/theme/src/components/layout.js b/theme/src/components/layout.js
index deda2da5..c0168d86 100644
--- a/theme/src/components/layout.js
+++ b/theme/src/components/layout.js
@@ -116,68 +116,68 @@ function Layout({children, pageContext, path}) {
                   ))}
                 </Breadcrumbs>
               ) : null}
-              <Box sx={{alignItems: 'center', display: 'flex'}}>
-                <Heading as="h1" sx={{fontSize: 7}}>
-                  {title}
-                </Heading>
-              </Box>
+              <Heading as="h1" sx={{fontSize: 7}}>
+                {title}
+              </Heading>
               {description ? <Box sx={{fontSize: 3, mb: 3}}>{description}</Box> : null}
-              <Box
-                sx={{
-                  display: 'flex',
-                  flexWrap: 'wrap',
-                  columnGap: 3,
-                  mb: 7,
-                  mt: 2,
-                  rowGap: 3,
-                  alignItems: 'center',
-                  fontSize: 1
-                }}
-              >
-                {status ? (
-                  <Box
-                    as={'ul'}
-                    sx={{
-                      display: 'flex',
-                      gap: 1,
-                      alignItems: 'center',
-                      m: 0,
-                      p: 0,
-                      paddingInline: 0,
-                      listStyle: 'none'
-                    }}
-                  >
-                    <li>
-                      <StatusLabel status={status} />
-                    </li>
-                    <li>
-                      <AccessibilityLabel a11yReviewed={a11yReviewed} />
-                    </li>
-                  </Box>
-                ) : null}
-                {source || storybook || lookbook || figma || rails || react ? (
-                  <Box
-                    as={'ul'}
-                    sx={{
-                      display: 'flex',
-                      flexWrap: 'wrap',
-                      gap: 4,
-                      alignItems: 'center',
-                      m: 0,
-                      p: 0,
-                      paddingInline: 0,
-                      listStyle: 'none'
-                    }}
-                  >
-                    {source ? <SourceLink href={source} /> : null}
-                    {lookbook ? <LookbookLink href={lookbook} /> : null}
-                    {storybook ? <StorybookLink href={storybook} /> : null}
-                    {react ? <ReactLink href={react} /> : null}
-                    {rails ? <RailsLink href={rails} /> : null}
-                    {figma ? <FigmaLink href={figma} /> : null}
-                  </Box>
-                ) : null}
-              </Box>
+              {status || source || storybook || lookbook || figma || rails || react ? (
+                <Box
+                  sx={{
+                    display: 'flex',
+                    flexWrap: 'wrap',
+                    columnGap: 3,
+                    mb: 7,
+                    mt: 2,
+                    rowGap: 3,
+                    alignItems: 'center',
+                    fontSize: 1
+                  }}
+                >
+                  {status ? (
+                    <Box
+                      as={'ul'}
+                      sx={{
+                        display: 'flex',
+                        gap: 1,
+                        alignItems: 'center',
+                        m: 0,
+                        p: 0,
+                        paddingInline: 0,
+                        listStyle: 'none'
+                      }}
+                    >
+                      <li>
+                        <StatusLabel status={status} />
+                      </li>
+                      <li>
+                        <AccessibilityLabel a11yReviewed={a11yReviewed} />
+                      </li>
+                    </Box>
+                  ) : null}
+                  {source || storybook || lookbook || figma || rails || react ? (
+                    <Box
+                      as={'ul'}
+                      sx={{
+                        display: 'flex',
+                        flexWrap: 'wrap',
+                        gap: 4,
+                        alignItems: 'center',
+                        m: 0,
+                        p: 0,
+                        paddingInline: 0,
+                        listStyle: 'none'
+                      }}
+                    >
+                      {source ? <SourceLink href={source} /> : null}
+                      {lookbook ? <LookbookLink href={lookbook} /> : null}
+                      {storybook ? <StorybookLink href={storybook} /> : null}
+                      {react ? <ReactLink href={react} /> : null}
+                      {rails ? <RailsLink href={rails} /> : null}
+                      {figma ? <FigmaLink href={figma} /> : null}
+                    </Box>
+                  ) : null}
+                </Box>
+              ) : null}
             </Box>
             {pageContext.tableOfContents.items ? (
               <Box

From 107cfc984a03f6b73ba54ae34bafd2a2d98186e4 Mon Sep 17 00:00:00 2001
From: Josep Martins <josepmartins@github.com>
Date: Thu, 20 Jul 2023 18:34:39 +0200
Subject: [PATCH 4/4] Add changeset

---
 .changeset/cool-balloons-begin.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/cool-balloons-begin.md

diff --git a/.changeset/cool-balloons-begin.md b/.changeset/cool-balloons-begin.md
new file mode 100644
index 00000000..bd8c8241
--- /dev/null
+++ b/.changeset/cool-balloons-begin.md
@@ -0,0 +1,7 @@
+---
+'@primer/gatsby-theme-doctocat': patch
+---
+
+- Move the heading out of the sidebar Navigation. This fixes the extra divider on top of the navigation.
+- Remove extra space below the heading when there's no status or external links
+- Remove extra space when there's no Breadcrumbs