diff --git a/packages/medusa/src/api/routes/admin/currencies/list-currencies.ts b/packages/medusa/src/api/routes/admin/currencies/list-currencies.ts index f1f64d1a60..11f28d1312 100644 --- a/packages/medusa/src/api/routes/admin/currencies/list-currencies.ts +++ b/packages/medusa/src/api/routes/admin/currencies/list-currencies.ts @@ -42,6 +42,9 @@ import { FeatureFlagDecorators } from "../../../../utils/feature-flag-decorators * source: | * curl -X POST '{backend_url}/admin/currencies' \ * -H 'Authorization: Bearer {api_token}' + * security: + * - api_token: [] + * - cookie_auth: [] * tags: * - Currencies * responses: diff --git a/packages/medusa/src/api/routes/admin/currencies/update-currency.ts b/packages/medusa/src/api/routes/admin/currencies/update-currency.ts index 9ddcb75418..8329a3dae9 100644 --- a/packages/medusa/src/api/routes/admin/currencies/update-currency.ts +++ b/packages/medusa/src/api/routes/admin/currencies/update-currency.ts @@ -43,6 +43,9 @@ import { EntityManager } from "typeorm" * --data-raw '{ * "includes_tax": true * }' + * security: + * - api_token: [] + * - cookie_auth: [] * tags: * - Currencies * responses: diff --git a/www/apps/api-reference/app/api/[area]/layout.tsx b/www/apps/api-reference/app/api/[area]/layout.tsx index c693332aed..72260b0d39 100644 --- a/www/apps/api-reference/app/api/[area]/layout.tsx +++ b/www/apps/api-reference/app/api/[area]/layout.tsx @@ -33,8 +33,8 @@ export default function RootLayout({ className={clsx( inter.variable, robotoMono.variable, - "bg-docs-bg dark:bg-docs-bg-dark font-base text-medium h-full w-full", - "text-medusa-fg-subtle dark:text-medusa-fg-subtle-dark" + "bg-docs-bg font-base text-medium h-full w-full", + "text-medusa-fg-subtle" )} > diff --git a/www/apps/api-reference/components/MDXComponents/Security/Description/index.tsx b/www/apps/api-reference/components/MDXComponents/Security/Description/index.tsx index 906e923af1..1345fc3e93 100644 --- a/www/apps/api-reference/components/MDXComponents/Security/Description/index.tsx +++ b/www/apps/api-reference/components/MDXComponents/Security/Description/index.tsx @@ -39,12 +39,7 @@ const SecurityDescription = ({ {getSecuritySchemaTypeName(securitySchema)}

{(securitySchema.type === "http" || securitySchema.type === "apiKey") && ( -

+

{securitySchema.type === "http" ? "HTTP Authorization Scheme" diff --git a/www/apps/api-reference/components/Tags/Operation/CodeSection/Responses/Sample/index.tsx b/www/apps/api-reference/components/Tags/Operation/CodeSection/Responses/Sample/index.tsx index 86b863bcf2..37615bef4c 100644 --- a/www/apps/api-reference/components/Tags/Operation/CodeSection/Responses/Sample/index.tsx +++ b/www/apps/api-reference/components/Tags/Operation/CodeSection/Responses/Sample/index.tsx @@ -91,7 +91,7 @@ const TagsOperationCodeSectionResponsesSample = ({ examples.find((ex) => ex.value === event.target.value) ) } - className="border-medusa-border-base dark:border-medusa-border-base-dark my-1 w-full rounded-sm border p-0.5" + className="border-medusa-border-base my-1 w-full rounded-sm border p-0.5" > {examples.map((example, index) => (

- + {endpointPath}
- +
{operation["x-codeSamples"] && ( diff --git a/www/apps/api-reference/components/Tags/Operation/DescriptionSection/Parameters/index.tsx b/www/apps/api-reference/components/Tags/Operation/DescriptionSection/Parameters/index.tsx index 6e83c0de33..001aa9d868 100644 --- a/www/apps/api-reference/components/Tags/Operation/DescriptionSection/Parameters/index.tsx +++ b/www/apps/api-reference/components/Tags/Operation/DescriptionSection/Parameters/index.tsx @@ -44,7 +44,7 @@ const TagsOperationDescriptionSectionParameters = ({ <> {Object.values(pathParameters.properties).length > 0 && ( <> -

+

Path Parameters

0 && ( <> -

+

Query Parameters

)} diff --git a/www/apps/api-reference/components/Tags/Operation/Parameters/Name/index.tsx b/www/apps/api-reference/components/Tags/Operation/Parameters/Name/index.tsx index b277f85b78..64ed9a03d5 100644 --- a/www/apps/api-reference/components/Tags/Operation/Parameters/Name/index.tsx +++ b/www/apps/api-reference/components/Tags/Operation/Parameters/Name/index.tsx @@ -62,7 +62,7 @@ const TagOperationParametersName = ({ {isRequired && ( <>
- + required diff --git a/www/apps/api-reference/components/Tags/Operation/Parameters/Nested/index.tsx b/www/apps/api-reference/components/Tags/Operation/Parameters/Nested/index.tsx index d8924c60f1..56db8bfeab 100644 --- a/www/apps/api-reference/components/Tags/Operation/Parameters/Nested/index.tsx +++ b/www/apps/api-reference/components/Tags/Operation/Parameters/Nested/index.tsx @@ -12,8 +12,8 @@ const TagsOperationParametersNested = ({ {...props} className={clsx( props.className, - "bg-docs-bg-surface dark:bg-docs-bg-surface-dark px-1 pt-1", - "border-medusa-border-base dark:border-medusa-border-base-dark my-1 rounded-sm border" + "bg-docs-bg-surface px-1 pt-1", + "border-medusa-border-base my-1 rounded-sm border" )} > {children} diff --git a/www/apps/api-reference/components/Tags/Operation/Parameters/Types/OneOf/index.tsx b/www/apps/api-reference/components/Tags/Operation/Parameters/Types/OneOf/index.tsx index 8ebfb7daa0..f5b73f0433 100644 --- a/www/apps/api-reference/components/Tags/Operation/Parameters/Types/OneOf/index.tsx +++ b/www/apps/api-reference/components/Tags/Operation/Parameters/Types/OneOf/index.tsx @@ -76,11 +76,9 @@ const TagOperationParamatersOneOf = ({ "border border-solid", activeTab === index && [ "bg-medusa-bg-subtle border-medusa-border-strong", - "dark:bg-medusa-bg-subtle-dark dark:border-medusa-border-strong-dark", ], activeTab !== index && [ "bg-medusa-bg-base border-medusa-border-base", - "dark:bg-medusa-bg-base-dark dark:border-medusa-border-base-dark", ] )} onClick={() => setActiveTab(index)} diff --git a/www/apps/api-reference/css/globals.css b/www/apps/api-reference/css/globals.css index 855f4d0cea..704966821b 100644 --- a/www/apps/api-reference/css/globals.css +++ b/www/apps/api-reference/css/globals.css @@ -20,11 +20,11 @@ } h1, h2, h3, h4 { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; } hr { - @apply h-[1px] w-full border-0 bg-medusa-border-base dark:bg-medusa-border-base-dark my-2; + @apply h-[1px] w-full border-0 bg-medusa-border-base my-2; } p, ul, ol { @@ -40,7 +40,7 @@ } *::selection { - @apply bg-medusa-bg-highlight dark:bg-medusa-bg-highlight-dark; + @apply bg-medusa-bg-highlight; } pre *::selection { diff --git a/www/apps/docs/src/components/DocSidebarItemIcon/index.tsx b/www/apps/docs/src/components/DocSidebarItemIcon/index.tsx index 346835bdb6..724d656975 100644 --- a/www/apps/docs/src/components/DocSidebarItemIcon/index.tsx +++ b/www/apps/docs/src/components/DocSidebarItemIcon/index.tsx @@ -24,9 +24,8 @@ const DocSidebarItemIcon: React.FC = ({ IconComponent={IconComponent} iconClassName={clsx("sidebar-item-icon")} iconColorClassName={clsx( - "text-medusa-fg-subtle dark:text-medusa-fg-subtle-dark", - is_disabled && - "text-medusa-fg-disabled dark:text-medusa-fg-disabled-dark" + "text-medusa-fg-subtle", + is_disabled && "text-medusa-fg-disabled" )} /> )} @@ -34,9 +33,8 @@ const DocSidebarItemIcon: React.FC = ({ )} diff --git a/www/apps/docs/src/components/Footer/SocialLinks/index.tsx b/www/apps/docs/src/components/Footer/SocialLinks/index.tsx index bc7fc823fe..f763a0f79b 100644 --- a/www/apps/docs/src/components/Footer/SocialLinks/index.tsx +++ b/www/apps/docs/src/components/Footer/SocialLinks/index.tsx @@ -12,16 +12,16 @@ type SocialLinksProps = { const SocialLinks: React.FC = ({ links = [] }) => { const socialIcons = { twitter: ( - + ), github: ( - + ), discord: ( - + ), linkedin: ( - + ), } diff --git a/www/apps/docs/src/components/LargeCard/index.tsx b/www/apps/docs/src/components/LargeCard/index.tsx index 1f0151143d..eafb5fca94 100644 --- a/www/apps/docs/src/components/LargeCard/index.tsx +++ b/www/apps/docs/src/components/LargeCard/index.tsx @@ -34,15 +34,15 @@ const LargeCard: React.FC = ({ return (
= ({
@@ -77,8 +76,7 @@ const LargeCard: React.FC = ({
diff --git a/www/apps/docs/src/components/LearningPath/Finish/index.tsx b/www/apps/docs/src/components/LearningPath/Finish/index.tsx index 4f019d3a45..8f23c99ab1 100644 --- a/www/apps/docs/src/components/LearningPath/Finish/index.tsx +++ b/www/apps/docs/src/components/LearningPath/Finish/index.tsx @@ -31,7 +31,7 @@ const LearningPathFinish: React.FC = ({ )} {type === "custom" && ( - + {step.descriptionJSX} )} diff --git a/www/apps/docs/src/components/LearningPath/Icon/index.tsx b/www/apps/docs/src/components/LearningPath/Icon/index.tsx index 7aca19982f..43224601c9 100644 --- a/www/apps/docs/src/components/LearningPath/Icon/index.tsx +++ b/www/apps/docs/src/components/LearningPath/Icon/index.tsx @@ -14,7 +14,7 @@ const LearningPathIcon: React.FC = ({ return (
= ({ ...rest }) => { {path.steps.map((step, index) => (
= ({ ...rest }) => { )} @@ -47,9 +47,7 @@ const LearningPathSteps: React.FC = ({ ...rest }) => { )}
{step.title} diff --git a/www/apps/docs/src/components/LearningPath/index.tsx b/www/apps/docs/src/components/LearningPath/index.tsx index 61f743d1d2..54e8f0e5e3 100644 --- a/www/apps/docs/src/components/LearningPath/index.tsx +++ b/www/apps/docs/src/components/LearningPath/index.tsx @@ -32,20 +32,20 @@ const LearningPath: React.FC = ({ return (
{path.label} @@ -53,7 +53,7 @@ const LearningPath: React.FC = ({ {path.description && ( {path.description} @@ -69,17 +69,15 @@ const LearningPath: React.FC = ({ className={clsx( "flex items-center p-1 gap-1", index !== path.steps.length - 1 && - "border-0 border-b border-solid border-medusa-border-base dark:border-medusa-border-base-dark" + "border-0 border-b border-solid border-medusa-border-base" )} key={index} >
- +
{step.title} diff --git a/www/apps/docs/src/css/_docusaurus.css b/www/apps/docs/src/css/_docusaurus.css index be51cd4634..4880ffada5 100644 --- a/www/apps/docs/src/css/_docusaurus.css +++ b/www/apps/docs/src/css/_docusaurus.css @@ -42,7 +42,7 @@ video { } .theme-code-block { - @apply border border-solid border-medusa-code-border dark:border-medusa-code-border-dark; + @apply border border-solid border-medusa-code-border; } .markdown p + .card-wrapper { @@ -54,8 +54,7 @@ video { } .card-highlighted { - - @apply relative mb-4 bg-medusa-bg-subtle dark:bg-medusa-bg-base-dark hover:bg-medusa-bg-subtle-hover dark:hover:bg-medusa-bg-subtle-hover-dark; + @apply relative mb-4 bg-medusa-bg-subtle dark:bg-medusa-bg-base hover:bg-medusa-bg-subtle-hover dark:hover:bg-medusa-bg-base-hover; } .col.toc-wrapper { @@ -79,12 +78,12 @@ video { } [class*=codeLineNumber] { - @apply text-medusa-code-text-subtle dark:text-medusa-code-text-subtle-dark !pl-0; + @apply text-medusa-code-text-subtle !pl-0; } .prism-code { @apply xs:max-w-[90%] text-code-body [&_*]:text-code-body xs:after:content-[''] xs:after:rounded xs:after:absolute; - @apply xs:after:right-0 xs:after:top-0 xs:after:w-[calc(10%+24px)] xs:after:h-full xs:after:bg-code-fade dark:xs:after:bg-code-fade-dark; + @apply xs:after:right-0 xs:after:top-0 xs:after:w-[calc(10%+24px)] xs:after:h-full xs:after:bg-code-fade; } .prism-code:not(:hover)::-webkit-scrollbar-thumb, @@ -166,7 +165,7 @@ details summary { } .theme-code-block { - @apply !bg-medusa-code-bg-base dark:!bg-medusa-code-bg-base-dark + @apply !bg-medusa-code-bg-base; } .reference-table .code-block-numbering { @@ -182,7 +181,7 @@ details summary { } .theme-doc-footer { - @apply !mt-0 border-0 !border-t border-solid !border-medusa-border-base dark:!border-medusa-border-base-dark; + @apply !mt-0 border-0 !border-t border-solid !border-medusa-border-base; @apply pt-2; } @@ -216,12 +215,12 @@ details > div { } .search-result-match { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; - @apply bg-medusa-bg-highlight dark:bg-medusa-bg-highlight-dark py-0.25 px-0; + @apply text-medusa-fg-base; + @apply bg-medusa-bg-highlight py-0.25 px-0; } .navbar { - @apply z-[399] p-0 border-0 border-b border-solid border-medusa-border-base dark:border-medusa-border-base-dark; + @apply z-[399] p-0 border-0 border-b border-solid border-medusa-border-base; } html:not(.plugin-redoc) .navbar:not(.navbar-sidebar--show) { @@ -257,7 +256,7 @@ h3 { } h1, h2, h3, h4, h5, h6 { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; } .markdown > h1:first-child, @@ -279,7 +278,7 @@ h1, h2, h3, h4, h5, h6 { } *::selection { - @apply bg-medusa-bg-highlight dark:bg-medusa-bg-highlight-dark; + @apply bg-medusa-bg-highlight; } .prism-code *::selection, .code-header::selection { diff --git a/www/apps/docs/src/css/_variables.css b/www/apps/docs/src/css/_variables.css index 4ca25c1f4f..c1a00d89a8 100644 --- a/www/apps/docs/src/css/_variables.css +++ b/www/apps/docs/src/css/_variables.css @@ -11,14 +11,14 @@ --font-roboto-mono: "Roboto Mono"; /* Colors */ - --ifm-color-primary: theme(colors.medusa.fg.base.DEFAULT); + --ifm-color-primary: theme(colors.medusa.fg.base); --ifm-background-color: theme(colors.medusa.bg.base.DEFAULT); --ifm-background-surface-color: theme(colors.medusa.bg.subtle.DEFAULT); - --ifm-color-content: theme(colors.medusa.fg.subtle.DEFAULT) !important; + --ifm-color-content: theme(colors.medusa.fg.subtle) !important; --ifm-color-content-secondary: var(--ifm-color-content); - --ifm-base-border-color: theme(colors.medusa.border.base.DEFAULT); - --ifm-strong-border-color: theme(colors.medusa.border.strong.DEFAULT); - --ifm-hr-background-color: theme(colors.medusa.border.base.DEFAULT); + --ifm-base-border-color: theme(colors.medusa.border.base); + --ifm-strong-border-color: theme(colors.medusa.border.strong); + --ifm-hr-background-color: theme(colors.medusa.border.base); /* Fonts */ --ifm-code-font-size: theme(fontSize.code-label); @@ -44,21 +44,21 @@ /* Links */ --ifm-link-color: theme(colors.medusa.fg.interactive.DEFAULT); - --ifm-link-hover-color: theme(colors.medusa.fg.interactive.hover.DEFAULT); + --ifm-link-hover-color: theme(colors.medusa.fg.interactive.hover); --ifm-link-decoration: none; --ifm-link-hover-decoration: none; /* Sidebar */ --ifm-menu-link-padding-vertical: 6px; --ifm-menu-link-padding-horizontal: theme(margin.1); - --ifm-menu-color: theme(colors.medusa.fg.subtle.DEFAULT); - --ifm-menu-color-active: theme(colors.medusa.fg.base.DEFAULT); - --ifm-menu-color-background-hover: theme(colors.medusa.bg.base.hover.DEFAULT); - --ifm-menu-color-background-active: theme(colors.medusa.bg.base.pressed.DEFAULT); + --ifm-menu-color: theme(colors.medusa.fg.subtle); + --ifm-menu-color-active: theme(colors.medusa.fg.base); + --ifm-menu-color-background-hover: theme(colors.medusa.bg.base.hover); + --ifm-menu-color-background-active: theme(colors.medusa.bg.base.pressed); /* Toc */ - --ifm-toc-border-color: theme(colors.medusa.border.base.DEFAULT); - --ifm-toc-link-color: theme(colors.medusa.fg.subtle.DEFAULT); + --ifm-toc-border-color: theme(colors.medusa.border.base); + --ifm-toc-link-color: theme(colors.medusa.fg.subtle); --ifm-toc-padding-horizontal: theme(padding.1); /* Navbar */ @@ -69,8 +69,8 @@ --ifm-navbar-item-padding-vertical: 6px; --ifm-navbar-item-padding-horizontal: theme(padding[1]); --ifm-navbar-height: theme(height.navbar); - --ifm-navbar-link-hover-color: theme(colors.medusa.fg.base.DEFAULT); - --ifm-navbar-link-color: theme(colors.medusa.fg.subtle.DEFAULT); + --ifm-navbar-link-hover-color: theme(colors.medusa.fg.base); + --ifm-navbar-link-color: theme(colors.medusa.fg.subtle); /* Inline Code */ --ifm-code-border-radius: theme(borderRadius.DEFAULT); @@ -90,34 +90,16 @@ --rt-color-white: var(--ifm-color-content) !important; /* Footer */ - --ifm-footer-color: theme(colors.medusa.fg.muted.DEFAULT); + --ifm-footer-color: theme(colors.medusa.fg.muted); --ifm-footer-background-color: transparent; --ifm-footer-padding-horizontal: 0; --ifm-footer-link-color: var(--ifm-color-content); - /* Search */ - --docsearch-searchbox-background: theme(colors.medusa.bg.subtle.DEFAULT) !important; - --docsearch-searchbox-focus-background: theme(colors.medusa.bg.subtle.hover.DEFAULT) !important; - --docsearch-searchbox-shadow: none !important; - --docsearch-modal-height: 472px !important; - --docsearch-modal-background: theme(colors.medusa.bg.base.DEFAULT) !important; - --docsearch-modal-shadow: theme(boxShadow.modal) !important; - --docsearch-container-background: theme(colors.medusa.bg.overlay.DEFAULT) !important; - --docsearch-key-gradient: theme(colors.medusa.tag.neutral.bg.DEFAULT) !important; - --docsearch-muted-color: theme(colors.medusa.fg.subtle.DEFAULT) !important; - --docsearch-spacing: 12px theme(spacing[1.5]) !important; - --docsearch-highlight-color: theme(colors.medusa.fg.muted.DEFAULT) !important; - --docsearch-text-color: var(--ifm-color-primary) !important; - --docsearch-hit-background: var(--docsearch-modal-background) !important; - --docsearch-hit-height: auto !important; - --docsearch-hit-active-color: var(--docsearch-text-color) !important; - --docsearch-footer-height: 40px !important; - /* Announcement Bar */ --docusaurus-announcement-bar-height: auto !important; /* Tables */ - --ifm-table-border-color: theme(colors.medusa.border.base.DEFAULT); + --ifm-table-border-color: theme(colors.medusa.border.base); --ifm-table-head-background: var(--ifm-background-surface-color); --ifm-table-head-color: var(--ifm-color-primary); --ifm-table-head-font-weight: theme(fontSize.medium-plus[1].fontWeight); @@ -126,57 +108,15 @@ html[data-theme="dark"] { /* Colors */ - --ifm-background-color: theme(colors.medusa.bg.subtle.dark); - --ifm-background-surface-color: theme(colors.medusa.bg.base.dark); - --ifm-hr-background-color: theme(colors.medusa.border.base.dark); - --ifm-color-primary: theme(colors.medusa.fg.base.dark); - --ifm-color-content: theme(colors.medusa.fg.subtle.dark) !important; - --ifm-base-border-color: theme(colors.medusa.border.base.dark); - --ifm-strong-border-color: theme(colors.medusa.border.strong.dark); - - /* Links */ - --ifm-link-color: theme(colors.medusa.fg.interactive.DEFAULT); - --ifm-link-hover-color: theme(colors.medusa.fg.interactive.hover.DEFAULT); + --ifm-background-color: theme(colors.medusa.bg.subtle.DEFAULT); + --ifm-background-surface-color: theme(colors.medusa.bg.base.DEFAULT); /* Sidebar */ - --ifm-menu-color: theme(colors.medusa.fg.subtle.dark); - --ifm-menu-color-active: theme(colors.medusa.fg.base.dark); - --ifm-menu-color-background-hover: theme(colors.medusa.bg.subtle.hover.dark); - --ifm-menu-color-background-active: theme(colors.medusa.bg.subtle.pressed.dark); - - /* Toc */ - --ifm-toc-border-color: theme(colors.medusa.border.base.dark); - --ifm-toc-link-color: theme(colors.medusa.fg.subtle.dark); + --ifm-menu-color-background-hover: theme(colors.medusa.bg.subtle.hover); + --ifm-menu-color-background-active: theme(colors.medusa.bg.subtle.pressed); /* Navbar */ --ifm-navbar-shadow: none; - --ifm-navbar-link-hover-color: theme(colors.medusa.fg.base.dark); - --ifm-navbar-link-color: theme(colors.medusa.fg.subtle.dark); - - /* Inline Code */ - --ifm-code-background: theme(colors.medusa.tag.neutral.bg.dark) !important; - - /* Code Blocks */ - --ifm-pre-background: theme(colors.medusa.code.bg.base.dark); - - /* Tooltip */ - --rt-color-dark: theme(colors.medusa.bg.base.dark) !important; - - /* Footer */ - --ifm-footer-color: theme(colors.medusa.fg.muted.dark); - - /* Search */ - --docsearch-searchbox-background: theme(colors.medusa.bg.subtle.dark) !important; - --docsearch-searchbox-focus-background: theme(colors.medusa.bg.subtle.hover.dark) !important; - --docsearch-modal-background: theme(colors.medusa.bg.base.dark) !important; - --docsearch-modal-shadow: theme(boxShadow.modal-dark) !important; - --docsearch-container-background: theme(colors.medusa.bg.overlay.dark) !important; - --docsearch-key-gradient: theme(colors.medusa.tag.neutral.bg.dark) !important; - --docsearch-muted-color: theme(colors.medusa.fg.subtle.dark) !important; - --docsearch-highlight-color: theme(colors.medusa.fg.muted.dark) !important; - - /* Tables */ - --ifm-table-border-color: theme(colors.medusa.border.base.dark); } @media screen and (min-width: 1441px) { @@ -201,8 +141,4 @@ html[data-theme="dark"] { .alert { --ifm-code-background: theme(colors.medusa.tag.neutral.bg.DEFAULT) !important; -} - -html[data-theme="dark"] .alert { - --ifm-code-background: theme(colors.medusa.tag.neutral.bg.dark) !important; } \ No newline at end of file diff --git a/www/apps/docs/src/css/components/sidebar.css b/www/apps/docs/src/css/components/sidebar.css index 0a780ec6cd..b65693224b 100644 --- a/www/apps/docs/src/css/components/sidebar.css +++ b/www/apps/docs/src/css/components/sidebar.css @@ -49,12 +49,12 @@ .menu__list-item .menu__list:not(.theme-doc-sidebar-menu) [class*=theme-doc-sidebar-item-]::before, .menu__list-item .menu__list:not(.theme-doc-sidebar-menu) .theme-doc-sidebar-item-category:first-child .menu__list-item-collapsible::before { - @apply bg-medusa-border-base dark:bg-medusa-border-base-dark; + @apply bg-medusa-border-base; } .theme-doc-sidebar-item-category-level-2 > .menu__list-item-collapsible .menu__link--active::before, .menu__list:not(.theme-doc-sidebar-menu) > .theme-doc-sidebar-item-link.theme-doc-sidebar-item-link-level-2 > .menu__link--active::before { - @apply bg-medusa-fg-interactive dark:bg-medusa-fg-interactive-dark !z-[2] !top-[6px]; + @apply bg-medusa-fg-interactive !z-[2] !top-[6px]; } .theme-doc-sidebar-item-category-level-2:only-child > .menu__list-item-collapsible .menu__link--active::before, @@ -113,7 +113,7 @@ } .menu__list-item-collapsible .menu__link--sublist:hover { - @apply !bg-medusa-bg-base-hover dark:!bg-medusa-bg-subtle-hover-dark; + @apply !bg-medusa-bg-base-hover dark:!bg-medusa-bg-subtle-hover; } .menu__list:not(.theme-doc-sidebar-menu) > .theme-doc-sidebar-item-link:last-child > .menu__link--active::before { @@ -143,7 +143,7 @@ /** General sidebar styles **/ .theme-doc-sidebar-container { - @apply z-[398] border-0 border-r border-solid border-medusa-border-base dark:border-medusa-border-base-dark; + @apply z-[398] border-0 border-r border-solid border-medusa-border-base; } /** Mobile Sidebar **/ @@ -158,10 +158,10 @@ /** Redocly sidebar **/ .redocusaurus .menu-content > div > ul > li > ul label:not([type=tag]):not(.active) { - @apply text-medusa-fg-subtle dark:text-medusa-fg-subtle-dark; - @apply hover:text-medusa-fg-base dark:hover:text-medusa-fg-base-dark; + @apply text-medusa-fg-subtle; + @apply hover:text-medusa-fg-base; } .redocusaurus .menu-content > div > ul > li > ul label:not([type=tag]).active { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; } \ No newline at end of file diff --git a/www/apps/docs/src/css/components/toc.css b/www/apps/docs/src/css/components/toc.css index 554dad84f0..16855cf486 100644 --- a/www/apps/docs/src/css/components/toc.css +++ b/www/apps/docs/src/css/components/toc.css @@ -8,7 +8,7 @@ @apply before:bg-no-repeat before:bg-[length:14px_10px] before:bg-[center_left]; @apply before:pl-[22px] before:content-['On_this_page'] before:pb-0 text-compact-small-plus; @apply after:content-[''] after:absolute after:left-0 after:top-2.5; - @apply after:h-full after:w-[1px] after:bg-medusa-border-base dark:after:bg-medusa-border-base-dark; + @apply after:h-full after:w-[1px] after:bg-medusa-border-base; } .theme-doc-toc-desktop .table-of-contents .table-of-contents__link { @@ -25,22 +25,22 @@ .theme-doc-toc-desktop .table-of-contents__link { @apply relative text-compact-x-small-plus; - @apply hover:text-medusa-fg-base dark:hover:text-medusa-fg-base-dark; + @apply hover:text-medusa-fg-base; } .theme-doc-toc-desktop .table-of-contents__link:hover code { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; } .theme-doc-toc-desktop .table-of-contents__link--active { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; @apply after:content-[''] after:absolute after:left-0 after:top-0; - @apply after:h-full after:w-[1px] after:bg-medusa-fg-base dark:after:bg-medusa-fg-base-dark; + @apply after:h-full after:w-[1px] after:bg-medusa-fg-base; @apply z-[1]; } .theme-doc-toc-desktop .table-of-contents__link--active code { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply text-medusa-fg-base; } .theme-doc-toc-desktop .table-of-contents li { diff --git a/www/apps/docs/src/css/components/tooltip.css b/www/apps/docs/src/css/components/tooltip.css index 4252925d0b..0a7b180a1a 100644 --- a/www/apps/docs/src/css/components/tooltip.css +++ b/www/apps/docs/src/css/components/tooltip.css @@ -1,5 +1,5 @@ .react-tooltip { - @apply !border !border-solid !border-medusa-border-base dark:!border-medusa-border-base-dark; + @apply !border !border-solid !border-medusa-border-base; @apply !rounded !text-compact-x-small-plus !shadow-tooltip dark:!shadow-tooltip-dark; @apply !py-0.4 !px-1 lg:block hidden; } diff --git a/www/apps/docs/src/css/custom.css b/www/apps/docs/src/css/custom.css index b24050e094..02ea17bb25 100644 --- a/www/apps/docs/src/css/custom.css +++ b/www/apps/docs/src/css/custom.css @@ -20,7 +20,7 @@ .sidebar-title .menu__link, .sidebar-title span { - @apply !text-compact-medium-plus text-medusa-fg-base dark:text-medusa-fg-base-dark; + @apply !text-compact-medium-plus text-medusa-fg-base; } .sidebar-title .menu__link--active, @@ -37,7 +37,7 @@ } .sidebar-group-headline > .menu__list-item-collapsible > .menu__link { - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark !p-0; + @apply text-medusa-fg-base !p-0; } .sidebar-group-headline > .menu__list-item-collapsible > .menu__link:not([href]) { @@ -55,12 +55,12 @@ } .sidebar-group-divider { - @apply pb-[6px] uppercase text-medusa-fg-muted dark:text-medusa-fg-muted-dark text-compact-x-small-plus; + @apply pb-[6px] uppercase text-medusa-fg-muted text-compact-x-small-plus; @apply first:pt-[6px] [&:not(:first-child)]:!pt-1; } .sidebar-divider-line { - @apply h-[1px] w-full bg-medusa-border-base dark:bg-medusa-border-base-dark my-1 mx-0; + @apply h-[1px] w-full bg-medusa-border-base my-1 mx-0; } .sidebar-back-link { @@ -69,11 +69,11 @@ .sidebar-back-link, .sidebar-title { - @apply lg:sticky lg:bg-medusa-bg-base dark:lg:bg-medusa-bg-subtle-dark lg:z-[100]; + @apply lg:sticky lg:bg-medusa-bg-base dark:lg:bg-medusa-bg-subtle lg:z-[100]; } .sidebar-back-link .menu__link { - @apply !p-0 hover:!bg-transparent hover:text-medusa-fg-base dark:hover:text-medusa-fg-base-dark; + @apply !p-0 hover:!bg-transparent hover:text-medusa-fg-base; } .sidebar-back-link .menu__link, @@ -86,7 +86,7 @@ } .sidebar-soon-link { - @apply pointer-events-none [&_*]:text-medusa-fg-disabled dark:[&_*]:text-medusa-fg-disabled-dark; + @apply pointer-events-none [&_*]:text-medusa-fg-disabled; } @@ -95,69 +95,31 @@ } .search-page-input { - @apply rounded border border-solid border-medusa-border-base dark:border-medusa-border-base-dark; - @apply font-base text-medium p-0.75 w-full bg-medusa-bg-subtle dark:bg-medusa-bg-subtle-dark; - @apply text-medusa-fg-base dark:text-medusa-fg-base-dark mb-1; + @apply rounded border border-solid border-medusa-border-base; + @apply font-base text-medium p-0.75 w-full bg-medusa-bg-subtle; + @apply text-medusa-fg-base mb-1; @apply transition-[border] duration-200 ease-ease; - @apply focus:border-medusa-border-base dark:focus:border-medusa-border-base-dark; + @apply focus:border-medusa-border-base; @apply focus:outline-none !shadow-none; } .code-header { - @apply py-0.75 px-1 bg-medusa-code-bg-header dark:bg-medusa-code-bg-header-dark text-medusa-code-text-subtle dark:text-medusa-code-text-subtle; + @apply py-0.75 px-1 bg-medusa-code-bg-header text-medusa-code-text-subtle; @apply flex justify-between items-center; @apply rounded-tl rounded-tr rounded-br-none rounded-bl-none border-b-0; - @apply border border-solid border-medusa-code-border dark:border-medusa-code-border-dark border-b-0; + @apply border border-solid border-medusa-code-border border-b-0; } .no-scrollbar::-webkit-scrollbar { @apply hidden; } - .animate__fastest { - --animate-duration: 0.2s; - } - - /* .btn-secondary { - @apply inline-flex flex-row justify-center items-center; - @apply py-[5px] px-0.75 rounded-sm cursor-pointer; - @apply bg-button-neutral bg-medusa-button-neutral dark:bg-button-neutral-dark dark:bg-medusa-button-neutral-dark; - @apply hover:bg-medusa-button-neutral-hover hover:bg-no-image dark:hover:bg-medusa-button-neutral-hover-dark hover:no-underline; - @apply active:bg-medusa-button-neutral-pressed active:bg-no-image dark:active:bg-medusa-button-neutral-pressed-dark; - @apply focus:bg-medusa-button-neutral-pressed focus:bg-no-image dark:focus:bg-medusa-button-neutral-pressed-dark; - @apply disabled:!bg-no-image disabled:bg-medusa-bg-disabled dark:disabled:bg-medusa-bg-disabled-dark; - @apply disabled:cursor-not-allowed; - @apply border border-solid border-medusa-border-base dark:border-medusa-border-base-dark; - @apply text-compact-small-plus text-medusa-fg-base dark:text-medusa-fg-base-dark; - @apply hover:text-medusa-fg-base hover:dark:text-medusa-fg-base-dark; - @apply shadow-button-neutral focus:shadow-button-neutral-focused active:shadow-button-neutral-focused transition-shadow; - @apply dark:shadow-button-neutral dark:focus:shadow-button-neutral-focused dark:active:shadow-button-neutral-focused; - @apply select-none; - } - - .btn-primary { - @apply inline-flex flex-row justify-center items-center; - @apply py-[5px] px-0.75 rounded-sm cursor-pointer; - @apply bg-button-inverted bg-medusa-button-inverted dark:bg-button-inverted-dark dark:bg-medusa-button-inverted-dark; - @apply hover:bg-medusa-button-inverted-hover hover:bg-no-image dark:hover:bg-medusa-button-inverted-hover-dark hover:no-underline; - @apply active:bg-medusa-button-inverted-pressed active:bg-no-image dark:active:bg-medusa-button-inverted-pressed-dark; - @apply focus:bg-medusa-button-inverted-pressed focus:bg-no-image dark:focus:bg-medusa-button-inverted-pressed-dark; - @apply shadow-button-colored active:shadow-button-colored-focused focus:shadow-button-colored-focused transition-shadow; - @apply dark:shadow-button-colored-dark dark:active:shadow-button-colored-focused-dark dark:focus:shadow-button-colored-focused-dark; - @apply disabled:!bg-no-image disabled:bg-medusa-button-disabled dark:disabled:bg-medusa-button-disabled-dark; - @apply disabled:cursor-not-allowed disabled:border-medusa-border-base dark:disabled:border-medusa-border-base-dark; - @apply text-compact-small-plus text-medusa-fg-on-inverted dark:text-medusa-fg-on-inverted-dark; - @apply disabled:text-medusa-fg-disabled dark:disabled:text-medusa-fg-disabled-dark; - @apply border border-medusa-border-loud dark:border-medusa-border-loud-dark; - @apply select-none; - } */ - .navbar-action-icon-item { - @apply lg:bg-button-neutral lg:bg-medusa-button-neutral lg:dark:bg-button-neutral-dark lg:dark:bg-medusa-button-neutral-dark; - @apply lg:hover:bg-medusa-button-neutral-hover lg:hover:bg-no-image lg:dark:hover:bg-medusa-button-neutral-hover-dark lg:hover:no-underline; - @apply lg:active:bg-medusa-button-neutral-pressed lg:active:bg-no-image lg:dark:active:bg-medusa-button-neutral-pressed-dark; - @apply lg:focus:bg-medusa-button-neutral-pressed lg:focus:bg-no-image lg:dark:focus:bg-medusa-button-neutral-pressed-dark; - @apply lg:lg:border lg:border-solid lg:border-medusa-border-base lg:dark:border-medusa-border-base-dark rounded; + @apply lg:bg-button-neutral lg:bg-medusa-button-neutral lg:dark:bg-button-neutral-dark; + @apply lg:hover:bg-medusa-button-neutral-hover lg:hover:bg-no-image lg:hover:no-underline; + @apply lg:active:bg-medusa-button-neutral-pressed lg:active:bg-no-image; + @apply lg:focus:bg-medusa-button-neutral-pressed lg:focus:bg-no-image; + @apply lg:lg:border lg:border-solid lg:border-medusa-border-base rounded; @apply w-2 h-2 flex justify-center items-center cursor-pointer; } diff --git a/www/apps/docs/src/theme/Admonition/index.tsx b/www/apps/docs/src/theme/Admonition/index.tsx index 35f5677ca4..e2704dd249 100644 --- a/www/apps/docs/src/theme/Admonition/index.tsx +++ b/www/apps/docs/src/theme/Admonition/index.tsx @@ -10,19 +10,19 @@ import { function NoteIcon() { return ( - + ) } function TipIcon() { return ( - + ) } function DangerIcon() { return ( - + ) } @@ -165,9 +165,9 @@ export default function Admonition(props: Props): JSX.Element { return (
@@ -175,7 +175,7 @@ export default function Admonition(props: Props): JSX.Element { {icon}
*:last-child]:mb-0", "[&>p>code]:px-0.5 [&>p>code]:text-code-label" )} diff --git a/www/apps/docs/src/theme/AnnouncementBar/CloseButton/index.tsx b/www/apps/docs/src/theme/AnnouncementBar/CloseButton/index.tsx index e2fe8f7e43..718cf4a704 100644 --- a/www/apps/docs/src/theme/AnnouncementBar/CloseButton/index.tsx +++ b/www/apps/docs/src/theme/AnnouncementBar/CloseButton/index.tsx @@ -26,7 +26,7 @@ export default function AnnouncementBarCloseButton( width={20} height={20} strokeWidth={1.5} - className="text-medusa-fg-muted dark:text-medusa-fg-muted-dark" + className="!text-medusa-fg-muted" /> ) diff --git a/www/apps/docs/src/theme/AnnouncementBar/Content/index.tsx b/www/apps/docs/src/theme/AnnouncementBar/Content/index.tsx index 19f1a805ca..698030f9e4 100644 --- a/www/apps/docs/src/theme/AnnouncementBar/Content/index.tsx +++ b/www/apps/docs/src/theme/AnnouncementBar/Content/index.tsx @@ -11,14 +11,14 @@ export default function AnnouncementBarContent( return (
@@ -28,10 +28,10 @@ export default function AnnouncementBar(): JSX.Element | null {
- +
diff --git a/www/apps/docs/src/theme/CodeBlock/Content/String.tsx b/www/apps/docs/src/theme/CodeBlock/Content/String.tsx index 035503d2f8..d9ac9e80c0 100644 --- a/www/apps/docs/src/theme/CodeBlock/Content/String.tsx +++ b/www/apps/docs/src/theme/CodeBlock/Content/String.tsx @@ -115,12 +115,12 @@ export default function CodeBlockString({ target="_blank" className={clsx( "bg-transparent border-none p-0.25 cursor-pointer rounded", - "hover:bg-medusa-code-bg-base dark:hover:bg-medusa-code-bg-base-dark [&:not(:first-child)]:ml-0.5", + "hover:bg-medusa-code-bg-base [&:not(:first-child)]:ml-0.5", "inline-flex justify-center items-center invisible xs:visible" )} rel="noreferrer" > - + )} @@ -131,7 +131,7 @@ export default function CodeBlockString({ )} text={code} > - + )}
diff --git a/www/apps/docs/src/theme/DocCard/index.tsx b/www/apps/docs/src/theme/DocCard/index.tsx index 8d241e94d5..60ecde46cf 100644 --- a/www/apps/docs/src/theme/DocCard/index.tsx +++ b/www/apps/docs/src/theme/DocCard/index.tsx @@ -36,7 +36,7 @@ function CardContainer({ href={href} className={clsx( "card", - "bg-medusa-bg-subtle dark:bg-medusa-bg-base-dark", + "bg-medusa-bg-subtle dark:bg-medusa-bg-base", "rounded shadow-card-rest dark:shadow-card-rest-dark", "transition-all duration-200 ease-ease", "flex p-1 !pb-1.5 h-full", @@ -66,7 +66,7 @@ function CardLayout({ className={clsx( containerClassName, !isSoon && - "hover:bg-medusa-bg-subtle-hover dark:hover:bg-medusa-bg-base-hover-dark", + "hover:bg-medusa-bg-subtle-hover dark:hover:bg-medusa-bg-base-hover", isSoon && "pointer-events-none", isHighlighted && "md:before:content-[''] md:before:absolute md:before:top-0 before:right-0 md:before:w-1/2 md:before:h-full md:before:bg-no-repeat md:before:bg-cover md:before:bg-card-highlighted dark:md:before:bg-card-highlighted-dark", @@ -81,11 +81,10 @@ function CardLayout({
*:last-child]:mb-0")}> @@ -94,10 +93,9 @@ function CardLayout({ {description && (

diff --git a/www/apps/docs/src/theme/DocPage/Layout/Sidebar/index.tsx b/www/apps/docs/src/theme/DocPage/Layout/Sidebar/index.tsx index cf16acf9d0..59ca8fdd79 100644 --- a/www/apps/docs/src/theme/DocPage/Layout/Sidebar/index.tsx +++ b/www/apps/docs/src/theme/DocPage/Layout/Sidebar/index.tsx @@ -36,10 +36,10 @@ export default function DocPageLayoutSidebar({ "min-[997px]:block min-[997px]:w-sidebar min-[997px]:transition-[left] min-[997px]:ease-ease min-[997px]:duration-200 min-[997px]:left-0 hidden", !hiddenSidebarContainer && "clip", hiddenSidebarContainer && - "min-[997px]:fixed min-[997px]:left-[-100%] min-[997px]:rounded min-[997px]:border-0 min-[997px]:border-medusa-border-strong min-[997px]:dark:border-medusa-border-strong-dark", + "min-[997px]:fixed min-[997px]:left-[-100%] min-[997px]:rounded min-[997px]:border-0 min-[997px]:border-medusa-border-strong", hiddenSidebarContainer && sidebarContext?.floatingSidebar && - "min-[997px]:!left-0.5 min-[997px]:top-[65px] min-[997px]:z-20 min-[997px]:bg-docs-bg min-[997px]:dark:bg-docs-bg-dark min-[997px]:shadow-flyout min-[997px]:dark:shadow-flyout-dark" + "min-[997px]:!left-0.5 min-[997px]:top-[65px] min-[997px]:z-20 min-[997px]:bg-docs-bg min-[997px]:shadow-flyout min-[997px]:dark:shadow-flyout-dark" )} onTransitionEnd={(e) => { if ( diff --git a/www/apps/docs/src/theme/Footer/Layout/index.tsx b/www/apps/docs/src/theme/Footer/Layout/index.tsx index 65bfe7c7c6..ab991accc5 100644 --- a/www/apps/docs/src/theme/Footer/Layout/index.tsx +++ b/www/apps/docs/src/theme/Footer/Layout/index.tsx @@ -17,7 +17,7 @@ export default function FooterLayout({