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

SHOR-111: Upgrade to bootstrap 3.4 #344

Merged
merged 2 commits into from
Dec 17, 2018
Merged

Conversation

AkA84
Copy link
Contributor

@AkA84 AkA84 commented Dec 17, 2018

Finishing the job started with #337

At the time of this writing, the v3.4 release is currently on hold, aiming for a ~December 10th release date

Given that, bootstrap-sass doesn't have a new release either, so the alternative is to simply point the dependency to the next branch until v3.4 will be properly released

Both bootstrap and bootstrap-sass have now released v3.4, so this PR points Shoreditch to that specific version instead of generically using the next branch of the bootstrap-sass project

Note

The vast majority of changes in this PR on the vendor files are most likely coming from automatic fixes from linters (using : instead of :: for pseudo elements, shuffling bits of code around etc).

The rest of the changes seems to be caused simply by the bootstrap-sass next branch not being fully synced with the then-future 3.4 release at the time we merged #337

@AkA84 AkA84 merged commit 78cc11e into master Dec 17, 2018
@AkA84 AkA84 deleted the SHOR-111-updgrade-to-bootstrap-3.4 branch December 17, 2018 14:24
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.

2 participants