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

Update from sass-twitter-bootstrap and fix asset-path patch and javascripts [Bootstrap 3] #368

Merged
merged 4 commits into from
May 31, 2013

Conversation

glebm
Copy link
Member

@glebm glebm commented May 28, 2013

Fixed the update script, fully automatic again.

  • Pulls from 3.0.0-beta branch of sass-twitter-bootstrap
  • Fixed asset paths with updated patch
  • Sorts out javascript according to the new structure, and fixed load order

@glebm glebm mentioned this pull request May 28, 2013
6 tasks
@glebm
Copy link
Member Author

glebm commented May 31, 2013

Updated description of what this is!

@@ -5,7 +5,7 @@
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
* Designed and built with all the love in the world by $mdo and $fat.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😃

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's awesome.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha, the 3.0.0-beta is beta :)

@thomas-mcdonald
Copy link
Member

Looks good to me. The changes with javascript paths will break the Compass template (although I imagine that's only a 1 char fix).

@thomas-mcdonald
Copy link
Member

@glebm, have a commit bit. Thanks for your help and PRs recently.

thomas-mcdonald added a commit that referenced this pull request May 31, 2013
Update from sass-twitter-bootstrap and fix asset-path patch and javascripts [Bootstrap 3]
@thomas-mcdonald thomas-mcdonald merged commit 73c2218 into twbs:3 May 31, 2013
@glebm
Copy link
Member Author

glebm commented Jun 1, 2013

@thomas-mcdonald thanks!

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.

4 participants