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

fix: Merge grid cell files into grid files and directories #815

Merged
merged 25 commits into from
Dec 15, 2023
Merged

fix: Merge grid cell files into grid files and directories #815

merged 25 commits into from
Dec 15, 2023

Conversation

VincentSmedinga
Copy link
Contributor

As Grid.Cell is a subcomponent of Grid, it makes sense to implement it in context rather than distinctly. We follow the same approach with things like Breadcrumb.Item and Footer.Top, even though these subcomponents have significantly less responsibilities than grid cell.

@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell November 28, 2023 10:22 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell November 28, 2023 10:34 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell November 28, 2023 10:37 Destroyed
@VincentSmedinga VincentSmedinga force-pushed the refactor/merge-grid-and-cell branch from bdae8ee to c99cc38 Compare November 30, 2023 11:20
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell November 30, 2023 11:20 Destroyed
@VincentSmedinga VincentSmedinga marked this pull request as ready for review November 30, 2023 14:05
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell November 30, 2023 14:05 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 5, 2023 12:59 Destroyed
@VincentSmedinga VincentSmedinga changed the title refactor: Merge grid cell files into grid files and directories fix: Merge grid cell files into grid files and directories Dec 5, 2023
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 5, 2023 13:08 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 6, 2023 12:28 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 8, 2023 09:04 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 8, 2023 15:35 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 8, 2023 16:19 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 12, 2023 09:02 Destroyed
dlnr
dlnr previously approved these changes Dec 12, 2023
View reviewed changes
Copy link
Contributor

@dlnr dlnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very cool solution getting the grid cell stories in!

@VincentSmedinga
Merge branch 'develop' into refactor/merge-grid-and-cell
6344238 
# Conflicts:
#	packages/css/src/components/grid/README.grid.md
#	storybook/storybook-react/src/Grid/Grid.docs.mdx
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 12, 2023 23:17 Destroyed
alimpens
alimpens reviewed Dec 13, 2023
View reviewed changes
packages/react/src/Grid/Grid.tsx Outdated Show resolved Hide resolved
packages/react/src/Grid/Grid.tsx Outdated Show resolved Hide resolved
storybook/storybook-docs/config/manager.js Outdated Show resolved Hide resolved
storybook/storybook-react/config/manager.js Outdated Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.docs.mdx Outdated Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.docs.mdx Outdated Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.stories.tsx Outdated Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.stories.tsx Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.stories.tsx Outdated Show resolved Hide resolved
storybook/storybook-react/src/Grid/Grid.stories.tsx Outdated Show resolved Hide resolved
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 13, 2023 11:36 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 15, 2023 11:24 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 15, 2023 12:34 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 15, 2023 13:02 Destroyed
@github-actions github-actions bot temporarily deployed to demo-merge-grid-and-cell December 15, 2023 13:06 Destroyed
@alimpens alimpens merged commit f4b4ec5 into develop Dec 15, 2023
4 checks passed
@alimpens alimpens deleted the refactor/merge-grid-and-cell branch December 15, 2023 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alimpens alimpens alimpens approved these changes

@dlnr dlnr dlnr left review comments

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@VincentSmedinga @dlnr @alimpens