-
-
Notifications
You must be signed in to change notification settings - Fork 105
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
Update templates #164
Update templates #164
Conversation
Parallax template is now updated. |
@DanielRuf I thought I'd shoot this one over to you. I like these templates and thought they were worth updating. What do you think? I think using the CDN's would be better than including the (now older) stylesheets and scripts as well. |
Definitely a good idea. It will take some time until I have reviewed all changes of this PR. |
Maybe you can cherry-pick the commits to a new branch. |
I had done a cherry-pick from 'templates' because I initially called it that, but there was already a 'templates' branch. Hence the closed PR. Instead of grabbing what I needed, it grabbed the entire branch. Should I use a --no-commit flag or something else? |
I would suggest the following:
This does the following:
You may see conflicts then that you have to resolve locally, commit the changes and then push again with |
Thank you for writing all that out! It worked. This rebased commit should be good, unless we want to definitely include the older templates too. I will keep the older branch intact incase. |
I updated the starter template to reflect our current CSS and JS CDN's and moved/renamed the files for the older one. I can work on the Parallax one as well. So this isn't quite "done" but thought I'd open up a PR.