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.

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

Layout #78

Merged
merged 4 commits into from
Jun 20, 2023
Merged

Layout #78

merged 4 commits into from
Jun 20, 2023

Conversation

meissadia
Copy link
Contributor

Closes #77

Components to easily implement the 1-3 and 2-1 style layouts

Changes

  • Adds components: Wrapper, Main, Content, Sidebar
  • Add stories demonstrating usage for 2-1 and 1-3 layouts

How to test this PR

  1. Needs unit tests
  2. Launch Storybook and click through the Layout stories.

Screenshots

Layout 1-3
Screen Shot 2023-06-14 at 5 39 29 PM

Layout 2-1 w/ sidebar bleed
Screen Shot 2023-06-14 at 5 39 38 PM

@netlify
Copy link

netlify bot commented Jun 14, 2023

Deploy Preview for cfpb-design-stories ready!

Name Link
🔨 Latest commit caa0e4f
🔍 Latest deploy log https://app.netlify.com/sites/cfpb-design-stories/deploys/64913af35c19b2000894c98d
😎 Deploy Preview https://deploy-preview-78--cfpb-design-stories.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@meissadia
Copy link
Contributor Author

Cleared merge conflicts.

Copy link
Member

@contolini contolini left a comment

Choose a reason for hiding this comment

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

There are a handful of scenarios where various props can't be combined (e.g. 1-3 with a bleedbar) so if that ends up confusing people we should prob add logic to have one prop override others. For now I think this is great!

@contolini contolini merged commit e6f46c1 into main Jun 20, 2023
@contolini contolini deleted the 77-layout branch June 20, 2023 13:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Component] Layout: Main, Wrapper, Content, Sidebar
2 participants