merging all conflicts

reactjs · Jul 1, 2024 · 28d401a · 28d401a
2 parents 51d80ff + 53fbed3
commit 28d401a
Show file tree

Hide file tree

Showing 38 changed files with 1,522 additions and 157 deletions.
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "@docsearch/css": "3.0.0-alpha.41",
     "@docsearch/react": "3.0.0-alpha.41",
     "@headlessui/react": "^1.7.0",
+    "@radix-ui/react-context-menu": "^2.1.5",
     "body-scroll-lock": "^3.1.3",
     "classnames": "^2.2.6",
     "date-fns": "^2.16.1",

diff --git a/public/images/brand/logo_dark.svg b/public/images/brand/logo_dark.svg
diff --git a/public/images/brand/logo_light.svg b/public/images/brand/logo_light.svg