Merge pull request #330 from Tropix126/a11y

2 files changed, 106 insertions, 115 deletions

diff --git a/packages/bun-landing/index.css b/packages/bun-landing/index.css
index 228503ca6..78b440edc 100644
--- a/packages/bun-landing/index.css
+++ b/packages/bun-landing/index.css
@@ -103,7 +103,7 @@ header {
   font-size: 1.2rem;
 }
 
-nav {
+.Navigation ul {
   white-space: nowrap;
   display: flex;
   gap: 2rem;
@@ -162,27 +162,24 @@ header {
   background: #15140e;
   padding: 24px 24px;
   border-radius: 24px;
+  user-select: none;
+  -webkit-user-select: none;
+  -webkit-user-drag: none;
+  -moz-user-select: none;
 }
 
-#install-label-heading {
+.InstallBox-label-heading {
   font-size: 1.4rem;
   margin-bottom: 1rem;
   font-weight: 500;
   font-weight: 500;
 }
 
-#install-label-subtitle {
+.InstallBox-label-subtitle {
   font-size: 0.9rem;
   color: var(--orange-light);
 }
 
-.unselectable {
-  user-select: none;
-  -webkit-user-select: none;
-  -webkit-user-drag: none;
-  -moz-user-select: none;
-}
-
 #usecases-section {
   background: linear-gradient(12deg, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.2)),
     conic-gradient(
@@ -226,7 +223,7 @@ header {
   padding: 0;
 }
 
-#code-box {
+.InstallBox-code-box {
   background-color: rgb(37, 36, 32);
   padding: 4px 16px;
   position: relative;
@@ -243,12 +240,18 @@ header {
   font-family: var(--monospace-font);
 }
 
-#curl:hover {
-  cursor: text;
+.InstallBox-curl {
+  user-select: all;
+  -webkit-user-select: text;
   pointer-events: auto;
+  white-space: nowrap;
+  cursor: text;
+  display: inline-flex;
+  padding: 12px 8px;
+  gap: 2ch;
 }
 
-#curl::before {
+.InstallBox-curl::before {
   display: block;
   content: "$" / "";
   color: var(--orange);
@@ -257,22 +260,11 @@ header {
   height: 1ch;
 }
 
-#curl {
-  user-select: all;
-  -webkit-user-select: text;
-  pointer-events: auto;
-  white-space: nowrap;
-  cursor: text;
-  display: inline-flex;
-  padding: 12px 8px;
-  gap: 2ch;
-}
-
-#view-source-link {
+.InstallBox-view-source-link {
   color: var(--orange-light);
 }
 
-#code-box-copy {
+.InstallBox-copy {
   height: 100%;
   display: flex;
   align-items: center;
@@ -287,12 +279,12 @@ header {
   font-family: inherit;
 }
 
-#code-box-copy:hover {
+.InstallBox-copy:hover {
   color: var(--blue);
   transform: scale(1.06);
 }
 
-#code-box-copy:active {
+.InstallBox-copy:active {
   transform: scale(1.12);
 }
 
@@ -305,36 +297,26 @@ header {
   align-items: center;
   width: min-content;
   white-space: nowrap;
-  list-style-type: none;
   padding: 0;
 }
 
 .Tab {
   width: min-content;
+  border: none;
+  background-color: transparent;
   font-family: var(--monospace-font);
   text-align: center;
-  padding-bottom: 8px;
   border-bottom: 1px solid #ccc;
   cursor: pointer;
-  padding: 0;
-}
-
-.TabButton {
-  background: transparent;
-  border: none;
-  padding: 16px 16px;
+  padding: 16px;
   color: inherit;
   font-size: inherit;
-  font-family: inherit;
-  cursor: inherit;
 }
 
-.TabButton[data-tab="react"]:hover,
-.Graphs--active-react .TabButton[data-tab="react"],
-.TabButton[data-tab="sqlite"]:hover,
-.Graphs--active-sqlite .TabButton[data-tab="sqlite"],
-.TabButton[data-tab="ffi"]:hover,
-.Graphs--active-ffi .TabButton[data-tab="ffi"] {
+.Tab:hover,
+.Graphs--active-react .Tab[data-tab="react"],
+.Graphs--active-sqlite .Tab[data-tab="sqlite"],
+.Graphs--active-ffi .Tab[data-tab="ffi"] {
   border-bottom-color: aquamarine;
   background-color: rgba(130, 216, 247, 0.1);
   border-right-color: aquamarine;
@@ -564,16 +546,12 @@ header {
   background-color: var(--background);
   border-radius: 8px;
   padding: 3px 8px;
-  color: white;
+  color: black;
   text-decoration: none !important;
   display: inline-block;
   font-family: var(--monospace-font) !important;
 }
 
-.Tag:visited {
-  color: white;
-}
-
 .mono {
   font-family: var(--monospace-font);
 }
@@ -597,7 +575,6 @@ header {
 
 .Tag--WebAPI {
   --background: #29b6f6;
-  color: white;
   box-shadow: inset -1px -1px 3px rgb(231, 187, 73);
 }
 
@@ -607,6 +584,7 @@ header {
 
 .Tag--TypeScript {
   --background: rgb(69, 119, 192);
+  color: white;
 }
 
 .Tag--React {
@@ -625,7 +603,8 @@ header {
 }
 
 .Tag--Bun {
-  --background: #ff17ff;
+  --background: #e600e5;
+  color: white;
 }
 
 .mono {
@@ -701,7 +680,7 @@ header {
     gap: 1rem;
   }
 
-  #install {
+  .InstallBox {
     margin-top: 0;
   }
 
@@ -720,11 +699,11 @@ header {
 }
 
 @media (max-width: 599px) {
-  #code-box-copy {
+  .InstallBox-copy {
     display: none;
   }
 
-  #code-box {
+  .InstallBox-code-box {
     font-size: 0.8rem;
   }
 }
@@ -801,7 +780,7 @@ header {
 }
 
 @media (max-width: 929px) {
-  #code-box {
+  .InstallBox-code-box {
     width: fit-content;
   }
 
@@ -866,11 +845,6 @@ header {
     border-bottom-color: #333;
   }
 
-  .TabButton {
-    padding-top: 16px;
-    padding-bottom: 16px;
-  }
-
   #pitch-content {
     max-width: 100%;
   }
diff --git a/packages/bun-landing/page.tsx b/packages/bun-landing/page.tsx
index 7599ed6db..d3f4cd867 100644
--- a/packages/bun-landing/page.tsx
+++ b/packages/bun-landing/page.tsx
@@ -177,25 +177,23 @@ const InstallBox = ({ desktop = false }) => (
     className={
       "InstallBox " + (desktop ? "InstallBox--desktop" : "InstallBox--mobile")
     }
-    id="install"
   >
-    <div id="install-label">
-      <div className="unselectable" id="install-label-heading">
+    <div className="InstallBox-label">
+      <div className="InstallBox-label-heading">
         Install Bun CLI v0.1.0 (beta)
       </div>
-      <div className="unselectable" id="install-label-subtitle">
+      <div className="InstallBox-label-subtitle">
         macOS x64 &amp; Silicon, Linux x64, Windows Subsystem for Linux
       </div>
     </div>
-    <div id="code-box">
-      <div id="curl">curl https://bun.sh/install | bash</div>
-      <button className="unselectable" id="code-box-copy" aria-label="Copy installation script">
+    <div className="InstallBox-code-box">
+      <div className="InstallBox-curl">curl https://bun.sh/install | bash</div>
+      <button className="InstallBox-copy" aria-label="Copy installation script">
         copy
       </button>
     </div>
     <a
-      className="unselectable"
-      id="view-source-link"
+      className="InstallBox-view-source-link"
       target="_blank"
       href="https://bun.sh/install"
     >
@@ -211,7 +209,7 @@ const Group = ({ children, ...props }) => (
 );
 
 export default ({ inlineCSS }) => (
-  <html>
+  <html lang="en">
     <head>
       <meta charSet="UTF-8" />
 
@@ -254,24 +252,26 @@ export default ({ inlineCSS }) => (
           </a>
 
           <nav className="Navigation">
-            <li>
-              <a className="NavText" href={DOCS}>
-                Docs
-              </a>
-            </li>
-            <li>
-              <a className="NavText" href="https://bun.sh/discord">
-                Discord
-              </a>
-            </li>
-            <li>
-              <a
-                className="NavText"
-                href="https://github.com/Jarred-Sumner/bun"
-              >
-                GitHub
-              </a>
-            </li>
+            <ul>
+              <li>
+                <a className="NavText" href={DOCS}>
+                  Docs
+                </a>
+              </li>
+              <li>
+                <a className="NavText" href="https://bun.sh/discord">
+                  Discord
+                </a>
+              </li>
+              <li>
+                <a
+                  className="NavText"
+                  href="https://github.com/Jarred-Sumner/bun"
+                >
+                  GitHub
+                </a>
+              </li>
+            </ul>
           </nav>
         </header>
       </div>
@@ -291,23 +291,39 @@ export default ({ inlineCSS }) => (
           </div>
 
           <div className="Graphs Graphs--active-react">
-            <ul className="Tabs" role="tablist">
-              <li className="Tab">
-                <button data-tab="react" id="tab-react" aria-controls="react-tab-content" className="TabButton" role="tab" aria-selected tabIndex={0}>
-                  Bun.serve
-                </button>
-              </li>
-              <li className="Tab">
-                <button data-tab="sqlite" id="tab-sqlite" aria-controls="sqlite-tab-content" className="TabButton" role="tab" tabIndex={-1}>
-                  bun:sqlite
-                </button>
-              </li>
-              <li className="Tab">
-                <button data-tab="ffi" id="tab-ffi" aria-controls="ffi-tab-content" className="TabButton" role="tab" tabIndex={-1}>
-                  bun:ffi
-                </button>
-              </li>
-            </ul>
+            <div className="Tabs" role="tablist">
+              <button
+                data-tab="react"
+                id="tab-react"
+                aria-controls="react-tab-content"
+                className="Tab"
+                role="tab"
+                aria-selected
+                tabIndex={0}
+              >
+                Bun.serve
+              </button>
+              <button
+                data-tab="sqlite"
+                id="tab-sqlite"
+                aria-controls="sqlite-tab-content"
+                className="Tab"
+                role="tab"
+                tabIndex={-1}
+              >
+                bun:sqlite
+              </button>
+              <button
+                data-tab="ffi"
+                id="tab-ffi"
+                aria-controls="ffi-tab-content"
+                className="Tab"
+                role="tab"
+                tabIndex={-1}
+              >
+                bun:ffi
+              </button>
+            </div>
             <div id="active-tab" className="ActiveTab">
               <div role="tabpanel" tabIndex={0} id="react-tab-content" aria-labelledby="tab-react" className="BarGraph BarGraph--react BarGraph--horizontal BarGraph--dark">
                 <h2 className="BarGraph-heading">
@@ -731,10 +747,10 @@ export default {
       <script
         dangerouslySetInnerHTML={{
           __html: `
-[...document.querySelectorAll(".TabButton")].map(el => {
+[...document.querySelectorAll(".Tab")].map(el => {
   el.addEventListener("click", function(e) {
     var tab = e.srcElement.getAttribute("data-tab");
-    [...document.querySelectorAll(".TabButton")].map(el => {
+    [...document.querySelectorAll(".Tab")].map(el => {
       var active = el.getAttribute("data-tab") === tab;
       el.setAttribute("tabindex", active ? 0 : -1);
       el.setAttribute("aria-selected", active);
@@ -747,8 +763,8 @@ export default {
   });
 
   el.addEventListener("keydown", e => {
-    var tabs = [...document.querySelectorAll(".TabButton")];
-    var activeTabEl = document.querySelector(".TabButton[aria-selected='true']");
+    var tabs = [...document.querySelectorAll(".Tab")];
+    var activeTabEl = document.querySelector(".Tab[aria-selected='true']");
     var activeTabIndex = tabs.indexOf(activeTabEl);
     if (e.key === 'ArrowRight' || e.key === 'ArrowDown') {
       e.preventDefault();
@@ -775,10 +791,11 @@ export default {
   });
 });
 
-document.querySelector("#code-box-copy").addEventListener("click", async e => {
-  var el = document.querySelector("#code-box");
-  await navigator.clipboard.writeText("curl https://bun.sh/install | bash");
-});
+for (const el of document.querySelectorAll(".InstallBox-copy")) {
+  el.addEventListener("click", async e => {
+    await navigator.clipboard.writeText("curl https://bun.sh/install | bash");
+  });
+}
       `,
         }}
       />