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

feat(styles): merge v10 and v11 for compat themes #9677

Merged
merged 5 commits into from
Sep 21, 2021
Merged

feat(styles): merge v10 and v11 for compat themes #9677

merged 5 commits into from
Sep 21, 2021

Conversation

joshblack
Copy link
Contributor

Closes #9617

This updates our compat themes entrypoint to merge v10 and v11 themes to make the use case of setting the theme from the compat entrypoint simpler.

Changelog

New

Changed

  • Update Sass to v1.41.0
  • Update themes compat entrypoint to merge v10 and v11 themes
  • Update test for setting themes in compat mode to new usage

Removed

Testing / Reviewing

  • verify tests pass as expected
  • Verify that you can pass in a compat theme and both v10 and v11 tokens are defined, and v11 tokens match the theme used from compat

@joshblack joshblack requested a review from a team as a code owner September 15, 2021 21:23
@netlify
Copy link

netlify bot commented Sep 15, 2021 •
edited
Loading

✔️ Deploy Preview for carbon-react-next ready!

🔨 Explore the source changes: adb3784

🔍 Inspect the deploy log: https://app.netlify.com/sites/carbon-react-next/deploys/6149ea38d0c18e00078bb235

😎 Browse the preview: https://deploy-preview-9677--carbon-react-next.netlify.app

@joshblack joshblack mentioned this pull request Sep 15, 2021
Closed
sstrubberg
sstrubberg reviewed Sep 15, 2021
View reviewed changes
Copy link
Member

@sstrubberg sstrubberg left a comment •
edited
Loading

Choose a reason for hiding this comment

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

The timing of this one is quite perfect because @jnm2377 and I are working on the compat example right now. Is there anything that should be updated in the docs to reflect these changes? Specifically the changes you've made to the test.

@netlify
Copy link

netlify bot commented Sep 15, 2021 •
edited
Loading

✔️ Deploy Preview for carbon-components-react ready!
Built without sensitive environment variables

🔨 Explore the source changes: adb3784

🔍 Inspect the deploy log: https://app.netlify.com/sites/carbon-components-react/deploys/6149ea38d104fc0007c82735

😎 Browse the preview: https://deploy-preview-9677--carbon-components-react.netlify.app

@netlify
Copy link

netlify bot commented Sep 15, 2021 •
edited
Loading

✔️ Deploy Preview for carbon-elements ready!

🔨 Explore the source changes: adb3784

🔍 Inspect the deploy log: https://app.netlify.com/sites/carbon-elements/deploys/6149ea38d104fc0007c8273a

😎 Browse the preview: https://deploy-preview-9677--carbon-elements.netlify.app

@joshblack
Copy link
Contributor Author

@sstrubberg good point! I'll update now.

@jnm2377 jnm2377 mentioned this pull request Sep 17, 2021
Closed
10 tasks
@sstrubberg sstrubberg enabled auto-merge (squash) September 21, 2021 14:20
@sstrubberg sstrubberg merged commit d460ea0 into carbon-design-system:main Sep 21, 2021
@joshblack joshblack mentioned this pull request Sep 22, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sstrubberg sstrubberg sstrubberg approved these changes

@dakahn dakahn dakahn approved these changes

@andreancardona andreancardona Awaiting requested review from andreancardona

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix bug with setting theme in compatability mode resulting in a noop
3 participants
@joshblack @sstrubberg @dakahn