From 145e6277db93a5859ff98bb9eb964ba3893fc5fa Mon Sep 17 00:00:00 2001 From: bryancunningham-okta Date: Wed, 24 Jul 2024 10:09:49 -0400 Subject: [PATCH 1/2] chore(odyssey-react-mui): bump to 1.20.0. not done in main by error --- lerna.json | 2 +- packages/browserslist-config-odyssey/package.json | 2 +- packages/odyssey-babel-loader/package.json | 2 +- packages/odyssey-babel-preset/package.json | 2 +- packages/odyssey-design-tokens/package.json | 2 +- packages/odyssey-react-mui/package.json | 2 +- packages/odyssey-storybook/package.json | 2 +- packages/odyssey-svgr/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index 8f6aa60b51..f8733e2633 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "npmClient": "yarn", "packages": ["packages/*"], "useNx": false, - "version": "1.19.0" + "version": "1.20.0" } diff --git a/packages/browserslist-config-odyssey/package.json b/packages/browserslist-config-odyssey/package.json index c8f4875959..ab42acbc2d 100644 --- a/packages/browserslist-config-odyssey/package.json +++ b/packages/browserslist-config-odyssey/package.json @@ -1,6 +1,6 @@ { "name": "@okta/browserslist-config-odyssey", - "version": "1.19.0", + "version": "1.20.0", "description": "Browserslist config for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-babel-loader/package.json b/packages/odyssey-babel-loader/package.json index b7b059ec3b..d527a0aa32 100644 --- a/packages/odyssey-babel-loader/package.json +++ b/packages/odyssey-babel-loader/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-babel-loader", - "version": "1.19.0", + "version": "1.20.0", "description": "Babel webpack loader for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-babel-preset/package.json b/packages/odyssey-babel-preset/package.json index 83c4b3387f..3a57d1f0ce 100644 --- a/packages/odyssey-babel-preset/package.json +++ b/packages/odyssey-babel-preset/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-babel-preset", - "version": "1.19.0", + "version": "1.20.0", "description": "Babel preset for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-design-tokens/package.json b/packages/odyssey-design-tokens/package.json index 25619e655a..bc3319aa59 100644 --- a/packages/odyssey-design-tokens/package.json +++ b/packages/odyssey-design-tokens/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-design-tokens", - "version": "1.19.0", + "version": "1.20.0", "description": "Design tokens for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-react-mui/package.json b/packages/odyssey-react-mui/package.json index e9a2af688c..d1b684b3f8 100644 --- a/packages/odyssey-react-mui/package.json +++ b/packages/odyssey-react-mui/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-react-mui", - "version": "1.19.0", + "version": "1.20.0", "description": "React MUI components for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-storybook/package.json b/packages/odyssey-storybook/package.json index 5e370d8120..3b23f1c7db 100644 --- a/packages/odyssey-storybook/package.json +++ b/packages/odyssey-storybook/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-storybook", - "version": "1.19.0", + "version": "1.20.0", "description": "Documentation for Odyssey, Okta's design system", "author": "Okta, Inc.", "license": "Apache-2.0", diff --git a/packages/odyssey-svgr/package.json b/packages/odyssey-svgr/package.json index 13157bb61d..1e6a9d6074 100644 --- a/packages/odyssey-svgr/package.json +++ b/packages/odyssey-svgr/package.json @@ -1,6 +1,6 @@ { "name": "@okta/odyssey-svgr", - "version": "1.19.0", + "version": "1.20.0", "description": "Configuration files for svgr icon conversion", "author": "Okta, Inc.", "license": "Apache-2.0", From 2cdca35004aef6b41f46baa0d75abf3316278d5e Mon Sep 17 00:00:00 2001 From: bryancunningham-okta Date: Wed, 24 Jul 2024 10:38:49 -0400 Subject: [PATCH 2/2] chore(odyssey-react-mui): fix Layout story margin --- .../odyssey-labs/Layout/Layout.stories.tsx | 169 ++++++++++-------- 1 file changed, 99 insertions(+), 70 deletions(-) diff --git a/packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx b/packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx index ca7a2e839b..e3aa45f81a 100644 --- a/packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx +++ b/packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx @@ -47,6 +47,12 @@ const RegionDisclaimer = () => { ); }; +const MarginContainer = styled.div({ + "& + &": { + marginBlockStart: "16px", + }, +}); + const storybookMeta: Meta = { title: "Labs Components/Layout", component: Layout, @@ -250,76 +256,99 @@ export const KitchenSink: StoryObj = { render: function () { return ( <> - - - Region - - - - - Region - - - Region - - - - - Region - - - Region - - - - - Region - - - Region - - - - - Region - - - Region - - - - - Region - - - Region - - - - - Region - - - Region - - - Region - - - - - Region - - - Region - - - Region - - - Region - - + + + + Region + + + + + + + + Region + + + Region + + + + + + + + Region + + + Region + + + + + + + + Region + + + Region + + + + + + + + Region + + + Region + + + + + + + + Region + + + Region + + + + + + + + Region + + + Region + + + Region + + + + + + + + Region + + + Region + + + Region + + + Region + + + ); },