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

Merging in the responsive redesign #522

Merged
merged 2,541 commits into from
Jun 4, 2016
Merged

Conversation

bridgetkromhout
Copy link
Collaborator

This is the merge for the responsive redesign discussed in #359. Please discuss in that issue or open new issues as desired.

Thanks to @mattstratton for doing the bulk of the heavy lifting here.

yvovandoorn and others added 30 commits May 18, 2016 17:18
Refactoring language around keynote talk

Former-commit-id: 46912f8
Refactoring language around keynote talk

Former-commit-id: 46912f8
Clean-up DC 2016 Sponsorship

Former-commit-id: 754bc19
Clean-up DC 2016 Sponsorship

Former-commit-id: 754bc19
Signed-off-by: Nathen Harvey <nharvey@chef.io>

Former-commit-id: 53ced98
Signed-off-by: Nathen Harvey <nharvey@chef.io>
Signed-off-by: Nathen Harvey <nharvey@chef.io>

Former-commit-id: 53ced98
InfoZen is a gold sponsor, not Platinum [DC2016]

Former-commit-id: c5cefa2
InfoZen is a gold sponsor, not Platinum [DC2016]
InfoZen is a gold sponsor, not Platinum [DC2016]

Former-commit-id: c5cefa2
[DC 2016] Change my affiliation

Former-commit-id: 3fcbcc7
[DC 2016] Change my affiliation

Former-commit-id: 3fcbcc7
[DC 2016] add GovReady to sponsors

Former-commit-id: 456336f
[DC 2016] add GovReady to sponsors
bridgetkromhout and others added 25 commits May 31, 2016 16:18
It's ugly and needs something to make it look nicer, but it works
Conflicts:
	content/events/2016-siliconvalley/program.md
Making the security track readable in new design.
Mechanism: making events a page to add alias
Creating redirect for presentations
Adds link to future & past events where expected.
@bridgetkromhout bridgetkromhout merged commit 1f5cd62 into master Jun 4, 2016
@yvovandoorn yvovandoorn deleted the mattstratton/redesign branch June 28, 2016 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.