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

Update templates #164

Merged
merged 2 commits into from Aug 13, 2021
Merged

Update templates #164

merged 2 commits into from Aug 13, 2021

Conversation

ghost
Copy link

@ghost ghost commented Aug 1, 2021

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.

@ghost ghost closed this Aug 1, 2021
@ghost ghost reopened this Aug 1, 2021
@ghost ghost closed this Aug 1, 2021
@ghost ghost deleted the update-templates branch August 1, 2021 01:36
@ghost ghost restored the update-templates branch August 1, 2021 01:36
@ghost ghost reopened this Aug 1, 2021
@ghost
Copy link
Author

ghost commented Aug 1, 2021

Parallax template is now updated.

@ghost ghost requested a review from DanielRuf August 5, 2021 00:11
@ghost
Copy link
Author

ghost commented Aug 5, 2021

@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.

@DanielRuf
Copy link

@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.

@DanielRuf
Copy link

It seems you have used an outdated / old branch as basis for your new branch.

image

image

image

You may have to redo the changes from a new branch, created form the v1-dev branch in your repository.

@DanielRuf
Copy link

Maybe you can cherry-pick the commits to a new branch.

@ghost
Copy link
Author

ghost commented Aug 5, 2021

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?

@DanielRuf
Copy link

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:

git checkout update-templates
git branch -m update-templates-old
git checkout v1-dev
git checkout -b update-templates
git cherry-pick -x 70db708c0649783e3501e62692aa8394fce5c895 6f74ed4e88e0ebb7592385dc4d82160394ceb398 70db708c0649783e3501e62692aa8394fce5c895

This does the following:

checkout the update-templates branch
rename it to update-templates-old
checkout v1-dev
create a fresh update-templates theme from v1-dev
cherry-pick the 3 commits and add references to the original commits in the commit messages

You may see conflicts then that you have to resolve locally, commit the changes and then push again with git push -f

@ghost
Copy link
Author

ghost commented Aug 5, 2021

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.

@DanielRuf DanielRuf merged commit 02d308e into materializecss:v1-dev Aug 13, 2021
@ghost ghost deleted the update-templates branch August 17, 2021 20:33
@Smankusors Smankusors added the documentation Improvements or additions to documentation label Apr 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants