Feature Branch: Global Nav Phase 1 (github#33465)

Co-authored-by: Robert Sese <[email protected]> Co-authored-by: Joe Oak <[email protected]> Co-authored-by: Peter Bengtsson <[email protected]>
ssyberg · Jan 31, 2023 · ef2efb0 · ef2efb0
1 parent dd48e9c
commit ef2efb0
Show file tree

Hide file tree

Showing 41 changed files with 654 additions and 1,231 deletions.
diff --git a/components/BasicSearch.tsx b/components/BasicSearch.tsx
diff --git a/components/DefaultLayout.tsx b/components/DefaultLayout.tsx
@@ -39,8 +39,6 @@ export const DefaultLayout = (props: Props) => {
       <div>
         <Head>
           <title>{page.fullTitle}</title>
-          {/* For local site search indexing */}
-          {page.topics.length > 0 && <meta name="keywords" content={page.topics.join(',')} />}
         </Head>
 
         {/* For local site search indexing */}
@@ -56,7 +54,7 @@ export const DefaultLayout = (props: Props) => {
   }
 
   return (
-    <div className="d-lg-flex">
+    <>
       <Head>
         {error === '404' ? (
           <title>{t('oops')}</title>
@@ -113,26 +111,28 @@ export const DefaultLayout = (props: Props) => {
       <a href="#main-content" className="sr-only">
         Skip to main content
       </a>
-      <SidebarNav />
-      {/* Need to set an explicit height for sticky elements since we also
+      <Header />
+      <div className="d-lg-flex">
+        <SidebarNav />
+        {/* Need to set an explicit height for sticky elements since we also
           set overflow to auto */}
-      <div className="flex-column flex-1">
-        <Header />
-        <main id="main-content" style={{ scrollMarginTop: '5rem' }}>
-          <DeprecationBanner />
-          <RestBanner />
+        <div className="flex-column flex-1">
+          <main id="main-content" style={{ scrollMarginTop: '5rem' }}>
+            <DeprecationBanner />
+            <RestBanner />
 
-          {props.children}
-        </main>
-        <footer>
-          <SupportSection />
-          <SmallFooter />
-          <ScrollButton
-            className="position-fixed bottom-0 mb-4 right-0 mr-4 z-1"
-            ariaLabel={t('scroll_to_top')}
-          />
-        </footer>
+            {props.children}
+          </main>
+          <footer>
+            <SupportSection />
+            <SmallFooter />
+            <ScrollButton
+              className="position-fixed bottom-0 mb-4 right-0 mr-4 z-1"
+              ariaLabel={t('scroll_to_top')}
+            />
+          </footer>
+        </div>
       </div>
-    </div>
+    </>
   )
 }
diff --git a/components/Search.module.scss b/components/Search.module.scss