some docs site polish (#853)

* some docs polish

* attempt to fix theme toggle

3 files changed, 25 insertions, 46 deletions

diff --git a/docs/src/components/DocSidebar.tsx b/docs/src/components/DocSidebar.tsx
index 92f34ff61..e1b2a2b17 100644
--- a/docs/src/components/DocSidebar.tsx
+++ b/docs/src/components/DocSidebar.tsx
@@ -2,6 +2,7 @@ import type { FunctionalComponent } from 'preact';
 import { h } from 'preact';
 import { useState, useEffect, useRef } from 'preact/hooks';
 import EditOnGithub from './EditOnGithub';
+import ThemeToggle from './ThemeToggle';
 
 const DocSidebar: FunctionalComponent<{ headers: any[]; editHref: string }> = ({
   headers = [],
@@ -104,6 +105,9 @@ const DocSidebar: FunctionalComponent<{ headers: any[]; editHref: string }> = ({
             </a>
           </li>
         </ul>
+        <div style={{margin: '2rem 0', textAlign: 'center'}}>
+          <ThemeToggle />
+        </div>
       </div>
     </nav>
   );
diff --git a/docs/src/components/SiteSidebar.astro b/docs/src/components/SiteSidebar.astro
index 6503c0414..382b122f4 100644
--- a/docs/src/components/SiteSidebar.astro
+++ b/docs/src/components/SiteSidebar.astro
@@ -47,7 +47,7 @@ const {currentPage} = Astro.props;
   }
 
   .nav-groups > :first-child {
-    padding-top: 2rem;
+    padding-top: var(--doc-padding);
   }
 
   .nav-groups > :last-child {
@@ -87,21 +87,10 @@ const {currentPage} = Astro.props;
     color: hsla(var(--color-base-white), 100%, 1);
   }
 
-  @media (min-width: 60em) {
-    .nav-link a {
-      border-radius: 999px;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
+  @media (min-width: 50em) {
     .nav-groups {
       padding: 0;
     }
   }
 
-  @media (min-width: 86.25em) {
-    .nav-link a {
-      border-radius: 8px;
-    }
-  }
-
 </style>
diff --git a/docs/src/components/ThemeToggle.tsx b/docs/src/components/ThemeToggle.tsx
index 95de4fba1..e990d8ea4 100644
--- a/docs/src/components/ThemeToggle.tsx
+++ b/docs/src/components/ThemeToggle.tsx
@@ -2,7 +2,7 @@ import type { FunctionalComponent } from 'preact';
 import { h, Fragment } from 'preact';
 import { useState, useEffect } from 'preact/hooks';
 
-const themes = ['system', 'light', 'dark'];
+const themes = ['light', 'dark'];
 
 const icons = [
   <svg
@@ -13,19 +13,6 @@ const icons = [
     fill="currentColor"
   >
     <path
-      fill-rule="evenodd"
-      d="M3 5a2 2 0 012-2h10a2 2 0 012 2v8a2 2 0 01-2 2h-2.22l.123.489.804.804A1 1 0 0113 18H7a1 1 0 01-.707-1.707l.804-.804L7.22 15H5a2 2 0 01-2-2V5zm5.771 7H5V5h10v7H8.771z"
-      clip-rule="evenodd"
-    />
-  </svg>,
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="20"
-    height="20"
-    viewBox="0 0 20 20"
-    fill="currentColor"
-  >
-    <path
       fillRule="evenodd"
       d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
       clipRule="evenodd"
@@ -44,39 +31,35 @@ const icons = [
 
 const ThemeToggle: FunctionalComponent = () => {
   const [theme, setTheme] = useState(() => {
-    if (typeof localStorage === 'undefined') {
-      return themes[0];
+    if (import.meta.env.SSR) {
+      return undefined;
     }
-
-    return localStorage.getItem('theme') || themes[0];
+    if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
+      return localStorage.getItem('theme');
+    }
+    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      return 'dark';
+    }
+    return 'light';
   });
 
   useEffect(() => {
     const root = document.documentElement;
-    if (theme === 'system') {
-      localStorage.removeItem('theme');
-      if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-        root.classList.add('theme-dark');
-      } else {
-        root.classList.remove('theme-dark');
-      }
+    if (theme === 'light') {
+      root.classList.remove('theme-dark');
     } else {
-      localStorage.setItem('theme', theme);
-      if (theme === 'light') {
-        root.classList.remove('theme-dark');
-      } else {
-        root.classList.add('theme-dark');
-      }
+      root.classList.add('theme-dark');
     }
   }, [theme]);
 
+
   return (
     <div id="theme-toggle">
       {themes.map((t, i) => {
         const icon = icons[i];
         const checked = t === theme;
         return (
-          <label className={checked ? 'checked' : ''}>
+          <label className={checked ? ' checked' : ''}>
             {icon}
             <input
               type="radio"
@@ -85,7 +68,10 @@ const ThemeToggle: FunctionalComponent = () => {
               value={t}
               title={`Use ${t} theme`}
               aria-label={`Use ${t} theme`}
-              onChange={() => setTheme(t)}
+              onChange={() => { 
+                localStorage.setItem('theme', t);
+                setTheme(t);
+              }}
             />
           </label>
         );