diff --git a/www/apps/book/config/index.ts b/www/apps/book/config/index.ts index 6a9f4523c0..789247fd1e 100644 --- a/www/apps/book/config/index.ts +++ b/www/apps/book/config/index.ts @@ -27,8 +27,8 @@ export const config: DocsConfig = { version: { ...globalConfig.version, bannerImage: { - light: basePathUrl("/images/get-started-card.png"), - dark: basePathUrl("/images/get-started-card-dark.png"), + light: basePathUrl("/images/release.png"), + dark: basePathUrl("/images/release-dark.png"), }, }, } diff --git a/www/apps/book/public/images/release-dark.png b/www/apps/book/public/images/release-dark.png new file mode 100644 index 0000000000..fc21e64a41 Binary files /dev/null and b/www/apps/book/public/images/release-dark.png differ diff --git a/www/apps/book/public/images/release.png b/www/apps/book/public/images/release.png new file mode 100644 index 0000000000..f190f115bd Binary files /dev/null and b/www/apps/book/public/images/release.png differ diff --git a/www/apps/cloud/config/index.ts b/www/apps/cloud/config/index.ts index caaa9e3bbf..732febcfcf 100644 --- a/www/apps/cloud/config/index.ts +++ b/www/apps/cloud/config/index.ts @@ -27,8 +27,8 @@ export const config: DocsConfig = { version: { ...globalConfig.version, bannerImage: { - light: basePathUrl("/images/get-started-card.png"), - dark: basePathUrl("/images/get-started-card-dark.png"), + light: basePathUrl("/images/release.png"), + dark: basePathUrl("/images/release-dark.png"), }, }, } diff --git a/www/apps/cloud/public/images/release-dark.png b/www/apps/cloud/public/images/release-dark.png new file mode 100644 index 0000000000..fc21e64a41 Binary files /dev/null and b/www/apps/cloud/public/images/release-dark.png differ diff --git a/www/apps/cloud/public/images/release.png b/www/apps/cloud/public/images/release.png new file mode 100644 index 0000000000..f190f115bd Binary files /dev/null and b/www/apps/cloud/public/images/release.png differ diff --git a/www/apps/resources/config/index.ts b/www/apps/resources/config/index.ts index 90a0d7a296..7c73b307a5 100644 --- a/www/apps/resources/config/index.ts +++ b/www/apps/resources/config/index.ts @@ -26,8 +26,8 @@ export const config: DocsConfig = { version: { ...globalConfig.version, bannerImage: { - light: basePathUrl("/images/get-started-card.png"), - dark: basePathUrl("/images/get-started-card-dark.png"), + light: basePathUrl("/images/release.png"), + dark: basePathUrl("/images/release-dark.png"), }, }, } diff --git a/www/apps/resources/public/images/release-dark.png b/www/apps/resources/public/images/release-dark.png new file mode 100644 index 0000000000..fc21e64a41 Binary files /dev/null and b/www/apps/resources/public/images/release-dark.png differ diff --git a/www/apps/resources/public/images/release.png b/www/apps/resources/public/images/release.png new file mode 100644 index 0000000000..f190f115bd Binary files /dev/null and b/www/apps/resources/public/images/release.png differ diff --git a/www/apps/user-guide/config/index.ts b/www/apps/user-guide/config/index.ts index 0b73754f5c..ba9317d09a 100644 --- a/www/apps/user-guide/config/index.ts +++ b/www/apps/user-guide/config/index.ts @@ -27,8 +27,8 @@ export const config: DocsConfig = { version: { ...globalConfig.version, bannerImage: { - light: basePathUrl("/images/get-started-card.png"), - dark: basePathUrl("/images/get-started-card-dark.png"), + light: basePathUrl("/images/release.png"), + dark: basePathUrl("/images/release-dark.png"), }, }, } diff --git a/www/apps/user-guide/public/images/release-dark.png b/www/apps/user-guide/public/images/release-dark.png new file mode 100644 index 0000000000..fc21e64a41 Binary files /dev/null and b/www/apps/user-guide/public/images/release-dark.png differ diff --git a/www/apps/user-guide/public/images/release.png b/www/apps/user-guide/public/images/release.png new file mode 100644 index 0000000000..f190f115bd Binary files /dev/null and b/www/apps/user-guide/public/images/release.png differ diff --git a/www/packages/docs-ui/src/components/Card/Layout/Mini/index.tsx b/www/packages/docs-ui/src/components/Card/Layout/Mini/index.tsx index 510edd20ba..92305b2c9c 100644 --- a/www/packages/docs-ui/src/components/Card/Layout/Mini/index.tsx +++ b/www/packages/docs-ui/src/components/Card/Layout/Mini/index.tsx @@ -25,6 +25,8 @@ export const CardLayoutMini = ({ onClose, className, imageDimensions = { width: 45, height: 36 }, + iconClassName, + cardRef, }: CardProps) => { const isExternal = useIsExternalLink({ href }) @@ -39,6 +41,7 @@ export const CardLayoutMini = ({ "w-fit transition-[shadow,background]", className )} + ref={cardRef} >
diff --git a/www/packages/docs-ui/src/components/Card/index.tsx b/www/packages/docs-ui/src/components/Card/index.tsx index 16d0fcffaa..eee365a9d2 100644 --- a/www/packages/docs-ui/src/components/Card/index.tsx +++ b/www/packages/docs-ui/src/components/Card/index.tsx @@ -32,6 +32,7 @@ export type CardProps = { closeable?: boolean onClose?: () => void hrefProps?: Partial> + cardRef?: React.Ref } export const Card = ({ type = "default", ...props }: CardProps) => { diff --git a/www/packages/docs-ui/src/components/ContentMenu/Products/index.tsx b/www/packages/docs-ui/src/components/ContentMenu/Products/index.tsx index 72b00541dd..24f4a28830 100644 --- a/www/packages/docs-ui/src/components/ContentMenu/Products/index.tsx +++ b/www/packages/docs-ui/src/components/ContentMenu/Products/index.tsx @@ -42,13 +42,19 @@ export const ContentMenuProducts = () => { - + {product.title} diff --git a/www/packages/docs-ui/src/components/ContentMenu/Toc/index.tsx b/www/packages/docs-ui/src/components/ContentMenu/Toc/index.tsx index 043e9b873c..243cdaa480 100644 --- a/www/packages/docs-ui/src/components/ContentMenu/Toc/index.tsx +++ b/www/packages/docs-ui/src/components/ContentMenu/Toc/index.tsx @@ -18,8 +18,11 @@ export const ContentMenuToc = () => { maxLevel: 4, }) - const formatHeadingContent = (content: string | null): string => { - return content?.replaceAll(/#$/g, "") || "" + const formatHeadingContent = (heading: HTMLHeadingElement): string => { + return Array.from(heading.childNodes) + .filter((child) => child.nodeType === Node.TEXT_NODE && child.textContent) + .map((textNode) => textNode.textContent!.trim()) + .join("") } const formatHeadingObject = ({ @@ -28,7 +31,7 @@ export const ContentMenuToc = () => { }: ActiveOnScrollItem): ToCItemUi => { const level = parseInt(heading.tagName.replace("H", "")) return { - title: formatHeadingContent(heading.textContent), + title: formatHeadingContent(heading), id: heading.id, level, children: children?.map(formatHeadingObject), @@ -68,7 +71,7 @@ export const ContentMenuToc = () => { return (
-
+
{items !== null && ( { { scrollToElement(elm) }} > + {item.id === activeItemId && ( + + )} {item.title} {(item.children?.length ?? 0) > 0 && ( diff --git a/www/packages/docs-ui/src/components/ContentMenu/Version/index.tsx b/www/packages/docs-ui/src/components/ContentMenu/Version/index.tsx index 185221925f..cf04fa2317 100644 --- a/www/packages/docs-ui/src/components/ContentMenu/Version/index.tsx +++ b/www/packages/docs-ui/src/components/ContentMenu/Version/index.tsx @@ -11,6 +11,7 @@ export const ContentMenuVersion = () => { } = useSiteConfig() const [showNewVersion, setShowNewVersion] = useState(false) const { isBrowser } = useIsBrowser() + const cardRef = React.useRef(null) useEffect(() => { if (!isBrowser) { @@ -32,6 +33,14 @@ export const ContentMenuVersion = () => { localStorage.setItem(LOCAL_STORAGE_KEY, version.number) } + useEffect(() => { + if (!showNewVersion || version.hide || !cardRef.current) { + return + } + + cardRef.current.classList.add("animate", "animate-fadeInDown") + }, [showNewVersion, version.hide, cardRef]) + return ( { height: 40, }} className={clsx( - "!border-0", - (!showNewVersion || version.hide) && "invisible" + "!border-0 !bg-medusa-bg-component hover:!bg-medusa-bg-component-hover", + "hover:!bg-medusa-bg-component-hover animation-fill-forwards", + "opacity-0" )} + iconClassName={clsx( + "!shadow-none border-[0.5px] border-medusa-alphas-alpha-250" + )} + cardRef={cardRef} /> ) } diff --git a/www/packages/docs-ui/src/components/Heading/H1/index.tsx b/www/packages/docs-ui/src/components/Heading/H1/index.tsx index f28c1fda75..2dfa874217 100644 --- a/www/packages/docs-ui/src/components/Heading/H1/index.tsx +++ b/www/packages/docs-ui/src/components/Heading/H1/index.tsx @@ -10,7 +10,7 @@ export const H1 = ({ className, ...props }: H1Props) => {

{ return (

{ return (

}, - a: Link, + a: (props) => , + // a: Link, strong: ({ className, ...props }: React.HTMLAttributes) => { return }, diff --git a/www/packages/docs-ui/src/components/MainNav/Items/Dropdown/index.tsx b/www/packages/docs-ui/src/components/MainNav/Items/Dropdown/index.tsx index 7479c5bad6..c284984bca 100644 --- a/www/packages/docs-ui/src/components/MainNav/Items/Dropdown/index.tsx +++ b/www/packages/docs-ui/src/components/MainNav/Items/Dropdown/index.tsx @@ -46,7 +46,7 @@ export const MainNavItemDropdown = ({ return (
{ diff --git a/www/packages/docs-ui/src/components/MainNav/index.tsx b/www/packages/docs-ui/src/components/MainNav/index.tsx index 846ef81e1c..71d5354cd1 100644 --- a/www/packages/docs-ui/src/components/MainNav/index.tsx +++ b/www/packages/docs-ui/src/components/MainNav/index.tsx @@ -102,7 +102,7 @@ export const MainNav = ({ className, itemsClassName }: MainNavProps) => { ], }} isActive={false} - className="text-medusa-fg-subtle" + className="text-medusa-fg-subtle hover:bg-medusa-button-transparent-hover rounded-docs_sm" wrapperClassName="z-10" />
diff --git a/www/packages/docs-ui/src/components/Menu/SubMenu/index.tsx b/www/packages/docs-ui/src/components/Menu/SubMenu/index.tsx index ca5fe40c70..b9c9331302 100644 --- a/www/packages/docs-ui/src/components/Menu/SubMenu/index.tsx +++ b/www/packages/docs-ui/src/components/Menu/SubMenu/index.tsx @@ -4,7 +4,7 @@ import React, { useState } from "react" import { Menu, MenuProps } from ".." import clsx from "clsx" import { MenuItemSubMenu } from "types" -import { ChevronRight } from "@medusajs/icons" +import { TriangleRightMini } from "@medusajs/icons" import Link from "next/link" type MenuSubMenuProps = Pick & { @@ -34,7 +34,7 @@ export const MenuSubMenu = ({ item, itemsOnClick }: MenuSubMenuProps) => { > {item.title} - + {open && ( diff --git a/www/packages/docs-ui/src/layouts/main-content.tsx b/www/packages/docs-ui/src/layouts/main-content.tsx index 7c4faef1ed..c593215436 100644 --- a/www/packages/docs-ui/src/layouts/main-content.tsx +++ b/www/packages/docs-ui/src/layouts/main-content.tsx @@ -71,7 +71,8 @@ export const MainContentLayout = ({ className={clsx( "pt-docs_4 lg:pt-docs_6 pb-docs_8 lg:pb-docs_4", showContentMenu && - "grid grid-cols-1 lg:mx-auto lg:grid-cols-[1fr_221px]", + "grid grid-cols-1 lg:mx-auto", + desktopSidebarOpen && "lg:grid-cols-[1fr_221px]", chatOpened && showCollapsedNavbar && "pl-docs_1", contentClassName )} diff --git a/www/packages/tailwind/base.tailwind.config.js b/www/packages/tailwind/base.tailwind.config.js index a880998931..729bc298a1 100644 --- a/www/packages/tailwind/base.tailwind.config.js +++ b/www/packages/tailwind/base.tailwind.config.js @@ -193,6 +193,11 @@ module.exports = { }, }, }, + alphas: { + alpha: { + 250: "var(--docs-alphas-alpha-250)", + } + } }, }, boxShadow: { @@ -347,21 +352,21 @@ module.exports = { h2: [ "18px", { - lineHeight: "28px", + lineHeight: "160%", fontWeight: "500", }, ], h3: [ "16px", { - lineHeight: "150%", + lineHeight: "160%", fontWeight: "500", }, ], h4: [ - "1rem", + "14px", { - lineHeight: "20px", + lineHeight: "160%", fontWeight: "500", }, ], diff --git a/www/packages/tailwind/theme-presets.js b/www/packages/tailwind/theme-presets.js index 3ff5ba56d2..de3eebf5d9 100644 --- a/www/packages/tailwind/theme-presets.js +++ b/www/packages/tailwind/theme-presets.js @@ -49,7 +49,7 @@ const light = { "--docs-button-danger-hover": "rgba(190, 18, 60, 1)", "--docs-button-danger-pressed": "rgba(159, 18, 57, 1)", "--docs-button-transparent": "rgba(255, 255, 255, 0)", - "--docs-button-transparent-hover": "rgba(244, 244, 245, 1)", + "--docs-button-transparent-hover": "rgba(24, 24, 27, 0.06)", "--docs-button-transparent-pressed": "rgba(228, 228, 231, 1)", "--docs-tags-neutral-bg": "rgba(244, 244, 245, 1)", @@ -103,6 +103,7 @@ const light = { "--docs-alpha-white-alpha-6": "rgba(255, 255, 255, 0.06)", "--docs-alpha-white-alpha-12": "rgba(255, 255, 255, 0.12)", + "--docs-alphas-alpha-250": "rgba(24, 24, 27, 0.1)", } const dark = { @@ -207,6 +208,8 @@ const dark = { "--docs-contrast-border-base": "rgba(82, 82, 91, 1)", "--docs-contrast-border-top": "rgba(24, 24, 27, 1)", "--docs-contrast-border-bot": "rgba(255, 255, 255, 0.08)", + + "--docs-alphas-alpha-250": "rgba(255, 255, 255, 0.1)", } module.exports = {