Merge branch 'feat/global' into feat/side-nav-menu

sanctuarycomputer · Nov 14, 2024 · 35ac703 · 35ac703
2 parents 3dbf788 + b3cec6e
commit 35ac703
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsx
@@ -1,6 +1,6 @@
 import React, { FC } from 'react'
 
-import { useDocsData } from '@docusaurus/plugin-content-docs/client'
+import useGlobalData from '@docusaurus/useGlobalData'
 
 const Sidebar: FC = () => {
   React.useEffect(() => {
@@ -13,18 +13,12 @@ const Sidebar: FC = () => {
       }
     })
   }, [])
-  const visibleItems = useDocsData(undefined)
-  console.log('!!!', visibleItems)
+
+  const globalData = useGlobalData()
+  console.log('globalData', globalData)
   return (
     <aside id="new-sidebar" className="w-sidebar-w">
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
-      <div>new sidebar</div>
+      Sidebar
     </aside>
   )
 }

diff --git a/src/css/infima-overrides.css b/src/css/infima-overrides.css
@@ -32,8 +32,8 @@ ul {
 }
 
 /* Remove default padding */
-ul[class],
-ol[class] {
+ul,
+ol {
   padding: 0;
 }
 
@@ -44,8 +44,8 @@ h2,
 h3,
 h4,
 p,
-ul[class],
-ol[class],
+ul,
+ol,
 li,
 figure,
 figcaption,

diff --git a/src/theme/Navbar.tsx b/src/theme/Navbar.tsx
@@ -29,7 +29,7 @@ const Navbar: FC = () => {
           <div className="hidden md:flex flex-row items-center">
             <ThemeSwitch />
             <a
-              className="button-label-4 py-2 px-3 bg-light-accent-2 dark:bg-dark-accent-2 rounded-small ml-2"
+              className="button-label-4 py-2 px-3 bg-light-accent-2 dark:bg-dark-accent-2 hover:bg-light-accent-2-hovered hover:dark:bg-dark-accent-2-hovered transition rounded-small ml-2"
               href="https://docs.google.com/forms/d/e/1FAIpQLSdjSkZam8KiatL9XACRVxCHjDJjaPGbls77PCXDKFn4JwykXg/viewform"
               target="_blank"
               rel="noreferrer"