Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: fix infinite scroll, update next.js, other fixes #9441

Merged
merged 3 commits into from
Oct 3, 2024
Merged

docs: fix infinite scroll, update next.js, other fixes #9441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc23d8
update nextjs
shahednasser Oct 2, 2024
bbcfc97
Merge branch 'develop' into docs/update-nextjs-14-2-14
shahednasser Oct 3, 2024
999cfdd
badge + scroll fixes
shahednasser Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions www/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# Documentation Resources

This directory holds the code and content of both the [documentation](https://docs.medusajs.com/) and [API reference](https://docs.medusajs.com/api/admin).

## docs Directory

The `docs` directory holds the code and content of the documentation website. The website is built with [Docusaurus v2](https://docusaurus.io/).

### api-reference Directory

The `api-reference` directory holds the code and OpenApi Specs of the API Reference. The API Reference is built with [Next.js](https://nextjs.org/).
This directory holds the code and content of all documentation projects
8 changes: 8 additions & 0 deletions www/apps/api-reference/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@
@apply bg-medusa-bg-highlight;
}

* {
scrollbar-color: var(--docs-border-base) var(--docs-bg-base);
}

aside * {
scrollbar-color: var(--docs-border-base) var(--docs-bg-subtle);
}

body[data-modal="opened"] {
@apply !overflow-hidden;
}
Expand Down
6 changes: 3 additions & 3 deletions www/apps/api-reference/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mdx-js/react": "^3.0.0",
"@medusajs/icons": "preview",
"@medusajs/ui": "^3.0.0",
"@next/mdx": "14.2.3",
"@next/mdx": "14.2.14",
"@readme/openapi-parser": "^2.5.0",
"@types/mapbox__rehype-prism": "^0.8.0",
"@types/mdx": "^2.0.5",
Expand All @@ -33,7 +33,7 @@
"jsdom": "^22.1.0",
"json-schema": "^0.4.0",
"json-stringify-pretty-compact": "^4.0.0",
"next": "^14.2.3",
"next": "^14.2.14",
"next-mdx-remote": "^4.4.1",
"openapi-sampler": "^1.3.1",
"openapi-types": "^12.1.3",
Expand All @@ -53,7 +53,7 @@
"yaml": "^2.3.1"
},
"devDependencies": {
"@next/bundle-analyzer": "^14.2.3",
"@next/bundle-analyzer": "^14.2.14",
"@types/jsdom": "^21.1.1",
"@types/pluralize": "^0.0.33",
"types": "*"
Expand Down
8 changes: 8 additions & 0 deletions www/apps/book/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
@apply bg-medusa-bg-highlight;
}

* {
scrollbar-color: var(--docs-border-base) var(--docs-bg-base);
}

aside * {
scrollbar-color: var(--docs-border-base) var(--docs-bg-subtle);
}

body[data-modal="opened"] {
@apply !overflow-hidden;
}
Expand Down
4 changes: 2 additions & 2 deletions www/apps/book/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"dependencies": {
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@next/mdx": "^14.2.3",
"@next/mdx": "^14.2.14",
"clsx": "^2.1.0",
"docs-ui": "*",
"next": "14.2.3",
"next": "14.2.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rehype-mdx-code-props": "^2.0.0",
Expand Down
8 changes: 8 additions & 0 deletions www/apps/resources/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
@apply bg-medusa-bg-highlight;
}

* {
scrollbar-color: var(--docs-border-base) var(--docs-bg-base);
}

aside * {
scrollbar-color: var(--docs-border-base) var(--docs-bg-subtle);
}

body[data-modal="opened"] {
@apply !overflow-hidden;
}
Expand Down
4 changes: 2 additions & 2 deletions www/apps/resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@mdx-js/loader": "^3.0.1",
"@mdx-js/react": "^3.0.1",
"@medusajs/icons": "preview",
"@next/mdx": "^14.2.3",
"@next/mdx": "^14.2.14",
"clsx": "^2.1.0",
"docs-ui": "*",
"next": "14.2.3",
"next": "14.2.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rehype-mdx-code-props": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion www/apps/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"docs-ui": "*",
"eslint-config-docs": "*",
"mdast-util-toc": "^7.0.0",
"next": "^14.2.3",
"next": "^14.2.14",
"next-contentlayer": "^0.3.4",
"next-themes": "^0.2.1",
"postcss": "8.4.27",
Expand Down
8 changes: 8 additions & 0 deletions www/apps/ui/src/styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
@apply !bg-medusa-contrast-bg-highlight;
}

* {
scrollbar-color: var(--docs-border-base) var(--docs-bg-base);
}

aside * {
scrollbar-color: var(--docs-border-base) var(--docs-bg-subtle);
}

body {
@apply text-ui-fg-subtle;
}
Expand Down
45 changes: 21 additions & 24 deletions www/apps/user-guide/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,29 @@
@tailwind components;
@tailwind utilities;

:root {
--foreground-rgb: 0, 0, 0;
--background-start-rgb: 214, 219, 220;
--background-end-rgb: 255, 255, 255;
}
@layer base {

@media (prefers-color-scheme: dark) {
:root {
--foreground-rgb: 255, 255, 255;
--background-start-rgb: 0, 0, 0;
--background-end-rgb: 0, 0, 0;
html {
-webkit-font-smoothing: antialiased;
}
}

body {
color: rgb(var(--foreground-rgb));
background: linear-gradient(
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb));
}
body {
@apply overflow-x-hidden;
}

*::selection {
@apply bg-medusa-bg-highlight;
}

* {
scrollbar-color: var(--docs-border-base) var(--docs-bg-base);
}

aside * {
scrollbar-color: var(--docs-border-base) var(--docs-bg-subtle);
}

@layer utilities {
.text-balance {
text-wrap: balance;
body[data-modal="opened"] {
@apply !overflow-hidden;
}
}
}
4 changes: 2 additions & 2 deletions www/apps/user-guide/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@medusajs/icons": "preview",
"@next/mdx": "^14.2.3",
"@next/mdx": "^14.2.14",
"clsx": "^2.1.0",
"docs-ui": "*",
"next": "14.2.3",
"next": "14.2.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rehype-mdx-code-props": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions www/packages/docs-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"cpy-cli": "^5.0.0",
"eslint": "^8",
"eslint-config-docs": "*",
"next": "14.1.0",
"next": "^14.2.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^5.0.1",
Expand Down Expand Up @@ -74,7 +74,7 @@
"react-google-recaptcha": "^3.1.0",
"react-instantsearch": "^7.13.0",
"react-markdown": "^8.0.7",
"react-medium-image-zoom": "^5.1.10",
"react-medium-image-zoom": "^5.2.10",
"react-tooltip": "^5.21.3",
"react-transition-group": "^4.4.5",
"react-uuid": "^2.0.0",
Expand Down
Loading
Loading