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

Theming: legacy options don't override set config options #6543

Merged
merged 4 commits into from
Apr 18, 2019
Merged

Theming: legacy options don't override set config options #6543

merged 4 commits into from
Apr 18, 2019

Conversation

hipstersmoothie
Copy link
Contributor

Issue: closes #6521

What I did

Ensure to only applyDeprecatedLayoutOptions if the deprecated options exist and if they do exist do not override them

How to test

  • Is this testable with Jest or Chromatic screenshots? yeah
  • Does this need a new example in the kitchen sink apps? no
  • Does this need an update to the documentation? no

If your answer is yes to any of these, please make sure to include it in your PR.

@vercel
Copy link

vercel bot commented Apr 17, 2019 •
edited
Loading

This pull request is automatically deployed with Now.
To access deployments, click Details below or on the icon next to each push.

Latest deployment for this branch: https://monorepo-git-bug.storybook.now.sh

@hipstersmoothie hipstersmoothie mentioned this pull request Apr 17, 2019
Closed
@ndelangen ndelangen self-assigned this Apr 17, 2019
@ndelangen
Merge branch 'next' into bug
01d74bf 
# Conflicts:
#	lib/theming/src/create.ts
@ndelangen
FIX tests & snapshots
40707f7
@shilman shilman changed the title Brand Theming Bug: don't override already set config options Theming: legacy options don't override already set config options Apr 18, 2019
@shilman shilman changed the title Theming: legacy options don't override already set config options Theming: legacy options don't override set config options Apr 18, 2019
@shilman shilman merged commit 4d15755 into next Apr 18, 2019
@shilman shilman deleted the bug branch April 18, 2019 00:40
@shilman shilman added the patch:yes Bugfix & documentation PR that need to be picked to main branch label Apr 18, 2019
@shilman shilman added this to the 5.0.x milestone Apr 18, 2019
shilman added a commit that referenced this pull request Apr 18, 2019
@shilman
Merge pull request #6543 from storybooks/bug
df012c1 
Theming: legacy options don't override set config options
@lonyele lonyele mentioned this pull request Apr 19, 2019
Closed
@shilman shilman added the patch:done Patch/release PRs already cherry-picked to main/release branch label Jun 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ndelangen ndelangen ndelangen approved these changes

@igor-dv igor-dv Awaiting requested review from igor-dv

@tmeasday tmeasday Awaiting requested review from tmeasday

@danielduan danielduan Awaiting requested review from danielduan

@usulpro usulpro Awaiting requested review from usulpro

Assignees

@hipstersmoothie hipstersmoothie

@ndelangen ndelangen

Labels
bug patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch theming
Projects
None yet
Milestone
5.0.x
Development

Successfully merging this pull request may close these issues.

Theme variables(brandTitle, brandUrl, brandImage) not working
3 participants
@hipstersmoothie @ndelangen @shilman