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

Upgrade Bootstrap to 3.2.0; FontAwesome to 4.1.0 #59

Merged
merged 3 commits into from
Aug 18, 2014

Conversation

nathancarnes
Copy link
Contributor

Notes

  • I'm loading Bootstrap and FontAwesome off of their recommended CDNs. If you'd prefer local copies of those, let me know and I'm happy to update that.
  • Since a larger redesign is planned, I didn't worry about 100% matching all of the visual styles. Everything should be close to the existing version, but things are subtly different in some spots. Part of that is the new version of Bootstrap, part of it is me cleaning some stuff up.
  • I'd like to revise and clean up the existing CSS (and consider moving to SCSS or LESS as a pre-processor), but I'll tackle that in a separate PR.

@nathancarnes
Copy link
Contributor Author

Closes #13, as well.

@jasonrclark
Copy link
Member

Don't personally have a strong opinion on self-hosting vs CDN, so I'm good with this unless someone else has objects.

Haven't spotted any differences or problems which would stop me from taking this, but did note that #60 which just came through might have some conflicts with this. Will hang on until we discuss what to do there with @JesseHerrick.

Thanks for your work on getting shoesrb.com up to date! 💖

@JesseHerrick
Copy link
Contributor

I'm completely getting rid of Bootstrap (but not Font Awesome) in #52, @nathancarnes unless you have a compelling reason otherwise.

@nathancarnes
Copy link
Contributor Author

@jasonrclark looks like it might conflict with #51, too, although I'm guessing rebasing that branch off of this one would be pretty easy.

@JesseHerrick I've got no particular love for Bootstrap. The only compelling reasons to keep it (or any other CSS framework, doesn't need to be Bootstrap) would be to make future updates easier for any maintainers that are less experienced with front-end dev/CSS, and to help enforce consistent styles throughout the site. Both of those concerns are really easily addressed with a one-page style guide, though. :)

@JesseHerrick
Copy link
Contributor

@nathancarnes I had not thought of making a style guide, but I'll be happy to do it once the design is complete. As for the merge conflict, I'll see if I can rebase it here.

@JesseHerrick
Copy link
Contributor

Never mind, there's no easy way to merge the two.

@jasonrclark jasonrclark merged commit 678a5a1 into shoes:gh-pages Aug 18, 2014
@jasonrclark
Copy link
Member

Thanks for the update and tidying @nathancarnes, and thanks @JesseHerrick for looking into #51.

As far as the future, I also don't particularly care whether we keep Bootstrap or not, so please feel free to follow your instincts there. A short style-guide for the less front-end aware (such as myself!) would be awesome!

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

Successfully merging this pull request may close these issues.

3 participants