-
Notifications
You must be signed in to change notification settings - Fork 51
Pubsite Rewrite 2019 -- Jekyll this time! #206
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
Conversation
|
You might have already thought about this but since this PR is |
|
@rswiernik would it make sense to just Squash + Merge? There's a few merge commits in the PR and some history was lost anyways moving between repos (originally on CSHPublicSiteV2, then my fork of this repo). |
|
I'm not sure that preserving the history for the dev of new versions of the site is really that important. If really wanted to, you could merge it into a separate historical branch on this repo, then merge that branch to master, squash the master history, then force push the new master history? eg: |
|
All that said, I would definitely prioritize having a single clean commit on master. But that's just me. |
|
Also, obligatory mention, this is your time to sneakily change the organization colors back to green/white/black. Just making sure that you have all the information you need before you merge this ;) |
devinmatte
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm happy to see this merged!
Please make sure that whoever merges this Squash and Merge when clicking.
After merged @RamZallan please switch the openshift project and webhooks to track from this project instead of your fork.
Also please tag the new commit with a version tag 😄
* Transfer code from CSHPublicSiteV2 repo * Remove local CSH Boostrap * Update footer with social media links + how to apply * Update sponsor image order, display, and alt text * Update and add alumni company logos, tweak descriptive text * Update eboard member names, update some images * Fix nav condensing, update welcome back photo, fix some wording * Add donation link to nav, update camping & holiday dinner pics * Tweak footer, put nav in .contaner, remove accidental file * Remove unused eboard photo js * Update eboard photos * Add Blog page, a few posts, and unique coloring for posts w/ no images * Update tour slideshow images * Update formatting, add Recent Posts section to homepage * Update footer and nav content, tweak slider styles * Update copy, replace some placeholder images * Position footer absolutely at bottom of content * Update copy, add images * Update README, add GPLv3.0 license * Update Jenkinsfile and config for staging URL * Update footer spacing * Add meta tags, remove placeholders, add links to Membership * Fix nav links, remove unused directory * Add WEBP files, functionality for many large images * Add more alumni companies to list, update old logos * Add page detailing the introductory process * Tweak various styles * Update nav, accessbility, copy * Remove old files * Update copy, html formatting * Update arcade machine photos * Update image for Collin's blog post * Add FAQ page * Move all images to S3 * Set max-height on homepage slider * Bold Computer Science House in homepage about text * Tweak slider CSS * Move Tour page to About section * Adding Firebase CI (#1) * Fix minor readme typo
🎉 🚢
🚀
View it live at pubsite.a.csh.rit.edu!
Here's a few previews, as well:

Closes #168
Closes #178
Closes #179
Closes #198