Cantera / cantera-website

Official Cantera Website
https://cantera.org
Other
15 stars 26 forks source link

Reformatted Reactors homepage, in progress #189

Closed chinahg closed 2 years ago

chinahg commented 2 years ago

Addressing open issue #175

speth commented 2 years ago

@chinahg - Rather than merging the main branch into your working branch, can you revert that and rebase onto main instead?

chinahg commented 2 years ago

@chinahg - Rather than merging the main branch into your working branch, can you revert that and rebase onto main instead?

Done, let me know if there is anything that is out of place.

speth commented 2 years ago

@chinahg, can you rebase this on the current main branch and resolve the conflicts?

chinahg commented 2 years ago

My api-docs folder is now empty after rebasing, causing broken links. It shows as having the documents on desktop, but in vscode the api-docs folder is empty.

Here is a screenshot of the desktop folder, it has a commit hash next to it? image @speth

bryanwweber commented 2 years ago

Yes, it moved to a submodule. You can run git submodule update --init --recursive to pull them in.

bryanwweber commented 2 years ago

@chinahg I agree with @speth let's push this across the finish line!

bryanwweber commented 2 years ago

Merged, congrats @chinahg!