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

turn html5 boilerplate into a layout #678

Merged
merged 1 commit into from Dec 15, 2012
Merged

Conversation

@barraponto
Copy link
Contributor

barraponto commented Dec 3, 2012

This is a very lightweight change to them html5 template, to use h5bp as a default layout for the template, instead of a default page. This is a really really subtle change when compared to #561

@barraponto
Copy link
Contributor Author

barraponto commented Dec 3, 2012

Also, this is easily backportable to 3.0.x branch, I'm using it locally with no issues.

@tdreyno
Copy link
Member

tdreyno commented Dec 3, 2012

I think this is a great idea, but it also means that maintenance (updating our copy of h5bp) is more involved. I think it's worth it.

@barraponto
Copy link
Contributor Author

barraponto commented Dec 3, 2012

As you can see, there are only two changes: adding erb lines to both title and content. It's fairly trivial.

@tdreyno
Copy link
Member

tdreyno commented Dec 4, 2012

This fails the unit tests, looks like you renamed a file that the CLI test expects to exist. If you can fix that up, get this passing Travis tests, we'll merge.

@barraponto
Copy link
Contributor Author

barraponto commented Dec 7, 2012

Oh crap, Travis is failing due to an update to therubyracer gem. Added a pull request to fix that: #681

@bhollis
Copy link
Member

bhollis commented Dec 14, 2012

@barraponto, could you squash this into a single commit? Thanks!

set hbp5 as the DEFAULT layout

use titles from YAML options
@barraponto
Copy link
Contributor Author

barraponto commented Dec 14, 2012

There you go.

tdreyno added a commit that referenced this pull request Dec 15, 2012
turn html5 boilerplate into a layout
@tdreyno tdreyno merged commit d119ac1 into middleman:master Dec 15, 2012
1 check failed
1 check failed
default The Travis build failed
Details
@tdreyno
Copy link
Member

tdreyno commented Dec 15, 2012

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.