Skip to content

Commit 9159300

Browse files
authored
Merge branch 'master' into fix/Generictype
2 parents 057379e + 0ff1989 commit 9159300

23 files changed

+474
-8
lines changed

docs/data/system/pages.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ const pages: readonly MuiPage[] = [
8080
title: 'Styles',
8181
legacy: true,
8282
children: [
83-
{ pathname: '/system/styles/basics' },
84-
{ pathname: '/system/styles/advanced' },
85-
{ pathname: '/system/styles/api', title: 'APIs' },
83+
{ pathname: 'https://v6.mui.com/system/styles/basics/', title: 'Basics' },
84+
{ pathname: 'https://v6.mui.com/system/styles/advanced/', title: 'Advanced' },
85+
{ pathname: 'https://v6.mui.com/system/styles/api/', title: 'APIs' },
8686
],
8787
},
8888
];

docs/notifications.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,10 @@
2323
"id": 87,
2424
"title": "Material UI v7 is here",
2525
"text": "This major release improves the integration with modern tools and consistency across the library. Check out the <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"material-ui-v7\" href=\"https://mui.com/blog/material-ui-v7-is-here/\">announcement blog post</a>."
26+
},
27+
{
28+
"id": 88,
29+
"title": "Introducing MUI X v8",
30+
"text": "Powerful new features and highly requested new components. Read the full details in the <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"mui-x-v8\" href=\"https://mui.com/blog/mui-x-v8/\">MUI X v8 announcement blog post</a>."
2631
}
2732
]

docs/pages/blog/mui-x-v8-alpha-zero.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: Explore the planned features and our roadmap to the next major vers
44
date: 2024-11-20T00:00:00.000Z
55
authors: ['josefreitas']
66
tags: ['MUI X', 'Product']
7+
manualCard: false
78
---
89

910
We're kicking off the development of [MUI X v8](https://github.com/mui/mui-x/releases/tag/v8.0.0-alpha.0).

docs/pages/blog/mui-x-v8.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import * as React from 'react';
2+
import TopLayoutBlog from 'docs/src/modules/components/TopLayoutBlog';
3+
import { docs } from './mui-x-v8.md?muiMarkdown';
4+
5+
export default function Page() {
6+
return <TopLayoutBlog docs={docs} />;
7+
}

docs/pages/blog/mui-x-v8.md

Lines changed: 453 additions & 0 deletions
Large diffs are not rendered by default.

docs/public/_redirects

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# To be removed 3+ years after being introduced
2929
# 2019
3030
/css-in-js/* /styles/:splat 301
31-
/customization/css-in-js/ /system/styles/basics/ 301
31+
/customization/css-in-js/ https://v6.mui.com/system/styles/basics/ 301
3232
/customization/overrides/ /material-ui/customization/how-to-customize/ 301
3333
/demos/selection-controls/ /material-ui/react-radio-button/ 301
3434
/demos/* /components/:splat 301
@@ -40,7 +40,7 @@
4040
/lab/* /components/:splat 301
4141
/layout/basics/ /material-ui/guides/responsive-ui/ 301
4242
/layout/breakpoints/ /material-ui/customization/breakpoints/ 301
43-
/layout/css-in-js/ /system/styles/basics/ 301
43+
/layout/css-in-js/ https://v6.mui.com/system/styles/basics/ 301
4444
/layout/* /components/:splat 301
4545
/page-layout-examples/* /material-ui/getting-started/templates/:splat 301
4646
/style/color/ /material-ui/customization/color/ 301
@@ -50,7 +50,7 @@
5050
/utils/modals/ /material-ui/react-modal/ 301
5151
/utils/popovers/ /material-ui/react-popover/ 301
5252
/utils/* /components/:splat 301
53-
/api/mui-theme-provider/ /system/styles/api/ 301
53+
/api/mui-theme-provider/ https://v6.mui.com/system/styles/api/ 301
5454
/components/expansion-panels/ /material-ui/react-accordion/ 301
5555
/api/expansion-panel/ /material-ui/api/accordion/ 301
5656
/:lang/api/expansion-panel/ /:lang/material-ui/api/accordion/ 301
Loading
Binary file not shown.
Loading
Loading
Loading
1.2 MB
Loading
1.12 MB
Loading
Loading
2.09 KB
Loading
4.05 MB
Binary file not shown.
Loading
Loading
Binary file not shown.
1.78 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/translations/translations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"/system/experimental-api/configure-the-sx-prop": "Configure the sx prop",
3434
"/system/experimental-api/css-theme-variables": "CSS Theme Variables",
3535
"/system/styles": "Styles",
36-
"/system/styles/basics": "Basics",
37-
"/system/styles/advanced": "Advanced",
36+
"https://v6.mui.com/system/styles/basics/": "Basics",
37+
"https://v6.mui.com/system/styles/advanced/": "Advanced",
3838
"/material-ui/getting-started-group": "Getting started",
3939
"/material-ui/getting-started": "Overview",
4040
"/material-ui/getting-started/installation": "Installation",

0 commit comments

Comments
 (0)