Skip to content
This repository has been archived by the owner on Jan 10, 2019. It is now read-only.

upgrade to bootstrap 3? #13

Merged
merged 1 commit into from
Dec 5, 2013
Merged

Conversation

deanmalmgren
Copy link
Contributor

This is a really great starting point for django projects; thanks for putting it together. I'd like to use the flat style in the latest release of Twitter Bootstrap (3.x) to avoid all the nonsense with gradients, etc. Happy to contribute this as a pull request when I get something together, but before I jumped in I wasn't sure if you intended for this project to be pinned at Bootstrap 2.3.1.

What's the best way to proceed here?

@xenith
Copy link
Owner

xenith commented Nov 20, 2013

I will gladly accept a pull request if you put one together. I just haven't had the time to bump Bootstrap/HTML5BoilerPlate/etc up myself.

@deanmalmgren
Copy link
Contributor Author

I think that should take care of it @xenith. This introduces a few new blocks in the _layout/base.html file to make things easier with Bootstrap 3. Most notably, it includes cdn_js and cdn_css blocks for loading bootstrap from CDNJS.

One other thing that I changed along the way was the use of the static templatetag instead of STATIC_URL. I'm not sure if that was deliberately still in there, but I thought I'd mention the change because its not exactly inline with the bootstrap upgrade.

Let me know if there's anything that looks out of place or if you have other preferences. I'd be happy to update this PR accordingly.

@deanmalmgren deanmalmgren mentioned this pull request Dec 3, 2013
xenith added a commit that referenced this pull request Dec 5, 2013
@xenith xenith merged commit eca5199 into xenith:master Dec 5, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants