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

Update Twitter Bootstrap to 2.1.0 #288

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@alansikora

alansikora commented Aug 21, 2012

The files:

  • css/bootstrap.js
  • css/bootstrap.css
  • css/bootstrap-response.css
  • img/glyphicons-halflings-white.png
  • img/glyphicons-halflings.png

have been replaced with the newer 2.1.0 files.

The file css/bootstrap-override.css is still the same.

Everything is working well, the change on Twitter Bootstrap is not big enough to break anything.

@audreyr

This comment has been minimized.

Contributor

audreyr commented Aug 21, 2012

Thanks for submitting this so fast after the Bootstrap 2.1.0 announcement, Alan! This is a pull request that I'm hoping to be able to merge in. A couple of things:

  1. I didn't find a CLA (contributor license agreement) on file from you. You'll need to fill out http://contribute.meteor.com/ -- can you please do so and comment when done?
  2. Could you please edit the description above and write up a bit about what exactly the pull request contains? What steps did you have to take to upgrade Bootstrap, did you have to manually update any image paths, did you have to make other changes to make it work nicely with Meteor, etc.? This will help save us time in reviewing the diff.
@alansikora

This comment has been minimized.

alansikora commented Aug 22, 2012

Meteor is awesome and we are using it on some serious and big projects. Expect bigger pull requests on the upcoming months =)

And excuse me for not having read the rules and fill the CLA before the pull request, shame on me for that.

I updated the pull request description, is that good enough?

@alansikora

This comment has been minimized.

alansikora commented Aug 22, 2012

Oh, and a question:

Is this going to other branches, like auth, as well?

@audreyr

This comment has been minimized.

Contributor

audreyr commented Aug 22, 2012

The description is great, thanks.

Oh no, I just realized you made the pull request against master. The contributor guidelines say "Make sure that your branch is based off of the devel branch." If you re-submit with a pull request against the devel branch, I'll merge it in, since it looks good.

The way it works is that first the changes go into the devel branch, and then they go into master (along with whatever feature branches of ours are ready) during the next release (0.4.0).

@alansikora

This comment has been minimized.

alansikora commented Aug 22, 2012

Oh, I'll do it again. I'm really sorry about that, was in a hurry and forgot about reading the rules.

@alansikora alansikora closed this Aug 22, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment