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

If both ish config settings are used, use the larger value #99

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

EvanLovely
Copy link
Member

I've made a release/3.x branch and branched it off the last 3.x tagged release, v3.5.0. This PR is pointing to that branch and should become v3.5.1.

If both config.ishViewportRange and config.ishMaximum are used, then config.ishViewportRange takes precedence. This PR makes it so that if both are present, the larger one is used. I could see this being helpful if you are trying to limit the upper end of the large view to something in the area of 1200-1600px wide, but you want to be able to expand it 2000px wide when you click "Full". The current setup doesn't even allow the resize bar to move past the large size.

Relates to pattern-lab/patternlab-php-core#131

@bmuenzenmeyer bmuenzenmeyer merged commit 9bcc427 into release/3.x Oct 31, 2017
@bmuenzenmeyer bmuenzenmeyer deleted the hotfix/ish-config-tweak branch October 31, 2017 12:16
@bmuenzenmeyer
Copy link
Member

Latest release at https://www.npmjs.com/package/styleguidekit-assets-default

will port into 4.X branches too

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.

None yet

2 participants