Permalink
Browse files

Bump version to 2.1.0

  • Loading branch information...
smt committed Aug 22, 2012
1 parent cd0703b commit 79508f494101fa2f3b8a5b36fd9728960bcbe88d
Showing with 15,085 additions and 28,498 deletions.
  1. +8 −1 Makefile
  2. +10 −8 README.md
  3. +579 −403 docs/assets/css/docs.css
  4. BIN docs/assets/ico/apple-touch-icon-114-precomposed.png
  5. BIN docs/assets/ico/apple-touch-icon-144-precomposed.png
  6. BIN docs/assets/ico/apple-touch-icon-57-precomposed.png
  7. BIN docs/assets/ico/apple-touch-icon-72-precomposed.png
  8. BIN docs/assets/ico/favicon.ico
  9. BIN docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
  10. BIN docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
  11. BIN docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
  12. BIN docs/assets/img/bs-docs-bootstrap-features.png
  13. BIN docs/assets/img/bs-docs-masthead-pattern.png
  14. BIN docs/assets/img/bs-docs-responsive-illustrations.png
  15. BIN docs/assets/img/bs-docs-twitter-github.png
  16. BIN docs/assets/img/example-sites/kippt.png
  17. BIN docs/assets/img/example-sites/soundready.png
  18. BIN docs/assets/img/examples/bootstrap-example-fluid.jpg
  19. BIN docs/assets/img/examples/bootstrap-example-hero.jpg
  20. BIN docs/assets/img/examples/bootstrap-example-starter.jpg
  21. BIN docs/assets/img/glyphicons-halflings.png
  22. BIN docs/assets/img/grid-baseline-20px.png
  23. BIN docs/assets/img/less-logo-large.png
  24. BIN docs/assets/img/responsive-illustrations.png
  25. +13 −43 docs/assets/js/application.js
  26. +104 −0 docs/assets/js/bootstrap-affix.js
  27. +1 −1 docs/assets/js/bootstrap-alert.js
  28. +1 −1 docs/assets/js/bootstrap-button.js
  29. +12 −5 docs/assets/js/bootstrap-carousel.js
  30. +4 −3 docs/assets/js/bootstrap-collapse.js
  31. +66 −16 docs/assets/js/bootstrap-dropdown.js
  32. +95 −74 docs/assets/js/bootstrap-modal.js
  33. +9 −4 docs/assets/js/bootstrap-popover.js
  34. +9 −9 docs/assets/js/bootstrap-scrollspy.js
  35. +2 −2 docs/assets/js/bootstrap-tab.js
  36. +15 −15 docs/assets/js/bootstrap-tooltip.js
  37. +2 −3 docs/assets/js/bootstrap-transition.js
  38. +50 −35 docs/assets/js/bootstrap-typeahead.js
  39. +368 −166 docs/assets/js/bootstrap.js
  40. +1 −1 docs/assets/js/bootstrap.min.js
  41. +3 −3 docs/assets/js/google-code-prettify/prettify.css
  42. +4 −9,252 docs/assets/js/jquery.js
  43. +1,686 −1,454 docs/base-css.html
  44. BIN docs/build/node_modules/hogan.js/web/images/logo.png
  45. BIN docs/build/node_modules/hogan.js/web/images/noise.png
  46. BIN docs/build/node_modules/hogan.js/web/images/small-hogan-icon.png
  47. BIN docs/build/node_modules/hogan.js/web/images/stripes.png
  48. +1,850 −1,453 docs/components.html
  49. +63 −0 docs/components/alert.html
  50. +66 −0 docs/components/breadcrumb.html
  51. +71 −0 docs/components/button-group.html
  52. +61 −0 docs/components/button.html
  53. +66 −0 docs/components/dropdown.html
  54. +100 −0 docs/components/form.html
  55. +60 −0 docs/components/icon.html
  56. +72 −0 docs/components/modal.html
  57. +77 −0 docs/components/nav.html
  58. +70 −0 docs/components/pagination.html
  59. +62 −0 docs/components/popover.html
  60. +62 −0 docs/components/progress-bar.html
  61. +89 −0 docs/components/table.html
  62. +62 −0 docs/components/tooltip.html
  63. +480 −0 docs/customize.html
  64. +5 −13 docs/examples/fluid.html
  65. +21 −4 docs/examples/hero.html
  66. +2 −2 docs/examples/starter-template.html
  67. +286 −0 docs/extend.html
  68. +330 −0 docs/getting-started.html
  69. +94 −147 docs/index.html
  70. +1,172 −991 docs/javascript.html
  71. +398 −483 docs/scaffolding.html
  72. +25 −24 docs/templates/layout.mustache
  73. +1,675 −1,436 docs/templates/pages/base-css.mustache
  74. +1,839 −1,443 docs/templates/pages/components.mustache
  75. +363 −0 docs/templates/pages/customize.mustache
  76. +169 −0 docs/templates/pages/extend.mustache
  77. +213 −0 docs/templates/pages/getting-started.mustache
  78. +69 −124 docs/templates/pages/index.mustache
  79. +1,154 −974 docs/templates/pages/javascript.mustache
  80. +376 −458 docs/templates/pages/scaffolding.mustache
  81. BIN img/glyphicons-halflings.png
  82. +12 −0 js/.jshintrc
  83. +104 −0 js/bootstrap-affix.js
  84. +1 −1 js/bootstrap-alert.js
  85. +1 −1 js/bootstrap-button.js
  86. +12 −5 js/bootstrap-carousel.js
  87. +4 −3 js/bootstrap-collapse.js
  88. +66 −16 js/bootstrap-dropdown.js
  89. +95 −74 js/bootstrap-modal.js
  90. +9 −4 js/bootstrap-popover.js
  91. +9 −9 js/bootstrap-scrollspy.js
  92. +2 −2 js/bootstrap-tab.js
  93. +15 −15 js/bootstrap-tooltip.js
  94. +2 −3 js/bootstrap-transition.js
  95. +50 −35 js/bootstrap-typeahead.js
  96. +2 −0 js/tests/index.html
  97. +19 −0 js/tests/unit/bootstrap-affix.js
  98. +15 −1 js/tests/unit/bootstrap-carousel.js
  99. +36 −2 js/tests/unit/bootstrap-collapse.js
  100. +14 −0 js/tests/unit/bootstrap-popover.js
  101. +11 −22 js/tests/unit/bootstrap-tooltip.js
  102. +56 −0 js/tests/unit/bootstrap-typeahead.js
  103. +4 −9,252 js/tests/vendor/jquery.js
  104. +2 −2 package.json
View
@@ -26,7 +26,7 @@ build:
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
@echo "Compiling documentation... ${CHECK} Done"
- @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > docs/assets/js/bootstrap.js
+ @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@@ -90,5 +90,12 @@ watch:
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"
+#
+# HAUNT GITHUB ISSUES 4 FAT & MDO ONLY (O_O )
+#
+
+haunt:
+ @haunt .issue-guidelines.js https://github.com/twitter/bootstrap
+
.PHONY: docs watch gh-pages
View
@@ -1,9 +1,9 @@
[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
=================
-Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
+Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
-To get started, checkout http://twitter.github.com/bootstrap!
+To get started, checkout http://getbootstrap.com!
@@ -43,7 +43,7 @@ Versioning
For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
-Releases will be numbered with the follow format:
+Releases will be numbered with the following format:
`<major>.<minor>.<patch>`
@@ -60,7 +60,7 @@ For more information on SemVer, please visit http://semver.org/.
Bug tracker
-----------
-Have a bug? Please create an issue here on GitHub! Also, when filing please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). thanks! <3
+Have a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).
https://github.com/twitter/bootstrap/issues
@@ -120,26 +120,28 @@ Developers
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **dependencies**
-Our makefile depends on you having recess, uglify.js, and jshint installed. To install, just run the following command in npm:
+Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
```
-$ npm install recess uglify-js jshint -g
+$ npm install recess connect uglify-js jshint -g
```
+ **build** - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test`
-Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on having phatomjs installed.
+Runs jshint and qunit tests headlessly in [phatomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+ **watch** - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
+
Contributing
------------
-Please make all pull requests against wip-* branches. Also, if your unit test contains javascript patches or features - you must include relevant unit tests. Thanks!
+Please submit all pull requests against *-wip branches. If your unit test contains javascript patches or features, you must include relevant unit tests. Thanks!
+
Authors
Oops, something went wrong.

0 comments on commit 79508f4

Please sign in to comment.