Permalink
Browse files

Merge branch '2.0.3-wip'

Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
  • Loading branch information...
2 parents 6506ede + 839ef3a commit e659dc7e1be2e09cec34703dce8c737496e3504e @fat fat committed Apr 24, 2012
Showing with 6,329 additions and 2,789 deletions.
  1. +3 −1 .gitignore
  2. +3 −0 .travis.yml
  3. +53 −22 Makefile
  4. +15 −5 README.md
  5. BIN docs/assets/bootstrap.zip
  6. +338 −219 docs/assets/css/bootstrap-responsive.css
  7. +1,634 −668 docs/assets/css/bootstrap.css
  8. +1 −5 docs/assets/css/docs.css
  9. BIN docs/assets/ico/apple-touch-icon-144-precomposed.png
  10. BIN docs/assets/ico/apple-touch-icon-72-precomposed.png
  11. BIN docs/assets/img/example-sites/kippt.png
  12. BIN docs/assets/img/glyphicons-halflings-white.png
  13. BIN docs/assets/img/glyphicons-halflings.png
  14. +6 −2 docs/assets/js/application.js
  15. +28 −32 docs/assets/js/bootstrap-alert.js
  16. +29 −33 docs/assets/js/bootstrap-button.js
  17. +27 −19 docs/assets/js/bootstrap-carousel.js
  18. +44 −25 docs/assets/js/bootstrap-collapse.js
  19. +18 −10 docs/assets/js/bootstrap-dropdown.js
  20. +25 −17 docs/assets/js/bootstrap-modal.js
  21. +13 −10 docs/assets/js/bootstrap-popover.js
  22. +43 −17 docs/assets/js/bootstrap-scrollspy.js
  23. +12 −7 docs/assets/js/bootstrap-tab.js
  24. +40 −35 docs/assets/js/bootstrap-tooltip.js
  25. +30 −20 docs/assets/js/bootstrap-transition.js
  26. +25 −11 docs/assets/js/bootstrap-typeahead.js
  27. +334 −236 docs/assets/js/bootstrap.js
  28. +1 −1 docs/assets/js/bootstrap.min.js
  29. +109 −90 docs/base-css.html
  30. +54 −66 docs/components.html
  31. +22 −6 docs/download.html
  32. +2 −1 docs/examples.html
  33. +12 −1 docs/examples/fluid.html
  34. +1 −0 docs/examples/hero.html
  35. +1 −0 docs/examples/starter-template.html
  36. +4 −2 docs/index.html
  37. +71 −21 docs/javascript.html
  38. +305 −42 docs/less.html
  39. +12 −14 docs/scaffolding.html
  40. +2 −1 docs/templates/layout.mustache
  41. +107 −89 docs/templates/pages/base-css.mustache
  42. +52 −65 docs/templates/pages/components.mustache
  43. +20 −5 docs/templates/pages/download.mustache
  44. +2 −1 docs/templates/pages/index.mustache
  45. +69 −20 docs/templates/pages/javascript.mustache
  46. +303 −41 docs/templates/pages/less.mustache
  47. +16 −19 docs/templates/pages/scaffolding.mustache
  48. +2 −1 docs/upgrading.html
  49. BIN img/glyphicons-halflings-white.png
  50. BIN img/glyphicons-halflings.png
  51. +10 −0 js/.jshintrc
  52. +8 −2 js/README.md
  53. +28 −32 js/bootstrap-alert.js
  54. +29 −33 js/bootstrap-button.js
  55. +27 −19 js/bootstrap-carousel.js
  56. +44 −25 js/bootstrap-collapse.js
  57. +18 −10 js/bootstrap-dropdown.js
  58. +25 −17 js/bootstrap-modal.js
  59. +13 −10 js/bootstrap-popover.js
  60. +43 −17 js/bootstrap-scrollspy.js
  61. +12 −7 js/bootstrap-tab.js
  62. +40 −35 js/bootstrap-tooltip.js
  63. +30 −20 js/bootstrap-transition.js
  64. +25 −11 js/bootstrap-typeahead.js
  65. +6 −1 js/tests/index.html
  66. +63 −0 js/tests/phantom.js
  67. +14 −0 js/tests/server.js
  68. +15 −0 js/tests/unit/bootstrap-alert.js
  69. +28 −0 js/tests/unit/bootstrap-carousel.js
  70. +15 −0 js/tests/unit/bootstrap-collapse.js
  71. +34 −0 js/tests/unit/bootstrap-dropdown.js
  72. +29 −0 js/tests/unit/bootstrap-modal.js
  73. +21 −0 js/tests/unit/bootstrap-phantom.js
  74. +16 −0 js/tests/unit/bootstrap-tab.js
  75. +74 −0 js/tests/unit/bootstrap-tooltip.js
  76. +1 −1 js/tests/unit/bootstrap-transition.js
  77. +18 −2 js/tests/unit/bootstrap-typeahead.js
  78. +5 −0 less/accordion.less
  79. +0 −36 less/badges.less
  80. +2 −3 less/bootstrap.less
  81. +55 −36 less/button-groups.less
  82. +15 −11 less/buttons.less
  83. +12 −1 less/close.less
  84. +4 −4 less/code.less
  85. +3 −3 less/component-animations.less
  86. +15 −20 less/dropdowns.less
  87. +58 −29 less/forms.less
  88. +55 −0 less/labels-badges.less
  89. +0 −38 less/labels.less
  90. +1 −1 less/layouts.less
  91. +53 −36 less/mixins.less
  92. +1 −1 less/modals.less
  93. +64 −41 less/navbar.less
  94. +36 −36 less/navs.less
  95. +14 −6 less/progress-bars.less
  96. +3 −3 less/reset.less
  97. +23 −0 less/responsive-1200px-min.less
  98. +149 −0 less/responsive-767px-max.less
  99. +15 −0 less/responsive-768px-979px.less
  100. +146 −0 less/responsive-navbar.less
  101. +41 −0 less/responsive-utilities.less
  102. +14 −337 less/responsive.less
  103. +39 −6 less/sprites.less
  104. +22 −5 less/tables.less
  105. +49 −0 less/tests/css-tests.css
  106. +808 −0 less/tests/css-tests.html
  107. +11 −2 less/thumbnails.less
  108. +7 −6 less/type.less
  109. +10 −6 less/variables.less
  110. +25 −0 package.json
View
@@ -6,6 +6,7 @@
*.rej
*.swo
*.swp
+*.zip
*.vi
*~
*.sass-cache
@@ -31,4 +32,5 @@ nbproject
.hg
.svn
.CVS
-.idea
+.idea
+node_modules
View
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+ - 0.6
View
@@ -2,51 +2,82 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
-LESS_COMPRESSOR ?= `which lessc`
-WATCHR ?= `which watchr`
+DATE=$(shell date +%I:%M%p)
+CHECK=\033[32m✔\033[39m
+HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
+
#
# BUILD DOCS
#
-docs: bootstrap
- rm docs/assets/bootstrap.zip
- zip -r docs/assets/bootstrap.zip bootstrap
- cp bootstrap/js/bootstrap.js docs/assets/js/bootstrap.js
- cp bootstrap/js/bootstrap.min.js docs/assets/js/bootstrap.min.js
- rm -r bootstrap
- lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
- lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
- node docs/build
- cp img/* docs/assets/img/
- cp js/*.js docs/assets/js/
- cp js/tests/vendor/jquery.js docs/assets/js/
+build:
+ @echo "\n${HR}"
+ @echo "Building Bootstrap..."
+ @echo "${HR}\n"
+ @jshint js/*.js --config js/.jshintrc
+ @jshint js/tests/unit/*.js --config js/.jshintrc
+ @echo "Running JSHint on javascript... ${CHECK} Done"
+ @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
+ @recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
+ @echo "Compiling LESS with Recess... ${CHECK} Done"
+ @node docs/build
+ @cp img/* docs/assets/img/
+ @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
+ @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
+ @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
+ @echo "Compiling and minifying javascript... ${CHECK} Done"
+ @echo "\n${HR}"
+ @echo "Bootstrap successfully built at ${DATE}."
+ @echo "${HR}\n"
+ @echo "Thanks for using Bootstrap,"
+ @echo "<3 @mdo and @fat\n"
+
+#
+# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
+#
+
+test:
+ jshint js/*.js --config js/.jshintrc
+ jshint js/tests/unit/*.js --config js/.jshintrc
+ node js/tests/server.js &
+ phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
+ kill -9 `cat js/tests/pid.txt`
+ rm js/tests/pid.txt
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
-# lessc & uglifyjs are required
+# recess & uglifyjs are required
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/css
mkdir -p bootstrap/js
cp img/* bootstrap/img/
- lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
- lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
- lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
- lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
+ recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
+ recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
+ recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
+ recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
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 > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/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*/" > bootstrap/js/copyright.js
+ echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
#
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
-gh-pages: docs
+gh-pages: bootstrap docs
+ rm -f docs/assets/bootstrap.zip
+ zip -r docs/assets/bootstrap.zip bootstrap
+ rm -r bootstrap
rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
node docs/build production
cp -r docs/* ../bootstrap-gh-pages
@@ -60,4 +91,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
-.PHONY: docs watch gh-pages
+.PHONY: docs watch gh-pages
View
@@ -1,4 +1,4 @@
-[Twitter Bootstrap](http://twitter.github.com/bootstrap)
+[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.
@@ -25,9 +25,9 @@ Releases will be numbered with the follow format:
And constructed with the following guidelines:
-* Breaking backward compatibility bumps the major
-* New additions without breaking backward compatibility bumps the minor
-* Bug fixes and misc changes bump the patch
+* Breaking backward compatibility bumps the major (and resets the minor and patch)
+* New additions without breaking backward compatibility bumps the minor (and resets the patch)
+* Bug fixes and misc changes bumps the patch
For more information on SemVer, please visit http://semver.org/.
@@ -81,8 +81,18 @@ 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:
+
+```
+$ npm install recess uglify-js jshint -g
+```
+
+ **build** - `make`
-Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
+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.
+ **watch** - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
View
Binary file not shown.
Oops, something went wrong.

0 comments on commit e659dc7

Please sign in to comment.