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

backmerge 1.20 => main #2298

Closed
wants to merge 2 commits into from
Closed

backmerge 1.20 => main #2298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
145e627
chore(odyssey-react-mui): bump to 1.20.0. not done in main by error
bryancunningham-okta Jul 24, 2024
2cdca35
chore(odyssey-react-mui): fix Layout story margin
bryancunningham-okta Jul 24, 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
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"npmClient": "yarn",
"packages": ["packages/*"],
"useNx": false,
"version": "1.19.0"
"version": "1.20.0"
}
2 changes: 1 addition & 1 deletion packages/browserslist-config-odyssey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-loader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-preset/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-design-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-storybook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
169 changes: 99 additions & 70 deletions packages/odyssey-storybook/src/components/odyssey-labs/Layout/Layout.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ const RegionDisclaimer = () => {
);
};

const MarginContainer = styled.div({
"& + &": {
marginBlockStart: "16px",
},
});

const storybookMeta: Meta<LayoutProps> = {
title: "Labs Components/Layout",
component: Layout,
Expand Down Expand Up @@ -250,76 +256,99 @@ export const KitchenSink: StoryObj<LayoutProps> = {
render: function () {
return (
<>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<MarginContainer>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>
</>
);
},
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-svgr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading