Permalink
Browse files

Merge pull request #54 from m5o/2.3.0-wip

update to match v2.3.0
  • Loading branch information...
2 parents 3c2901f + 60ac348 commit 6ba9482319b6dcb7ae77461f2084271a241fdc2f @m5o m5o committed Feb 9, 2013
Showing with 2,581 additions and 1,060 deletions.
  1. +350 −0 CHANGELOG.md
  2. +1 −1 Gemfile.lock
  3. +176 −176 LICENSE
  4. +41 −16 Makefile
  5. +14 −10 README.md
  6. +1 −1 Rakefile
  7. +0 −9 bootstrap-2.2.2.min.css
  8. +216 −121 bootstrap-2.2.2.css → bootstrap-2.3.0.css
  9. +9 −0 bootstrap-2.3.0.min.css
  10. +0 −9 bootstrap-responsive-2.2.2.min.css
  11. +50 −33 bootstrap-responsive-2.2.2.css → bootstrap-responsive-2.3.0.css
  12. +9 −0 bootstrap-responsive-2.3.0.min.css
  13. +2 −2 component.json
  14. +0 −1 composer.json
  15. +1 −1 docs/assets/css/bootstrap-responsive.css
  16. +1 −1 docs/assets/css/bootstrap.css
  17. +5 −2 docs/assets/css/docs.css
  18. BIN docs/assets/img/bootstrap-docs-readme.png
  19. BIN docs/assets/img/examples/bootstrap-example-carousel.png
  20. BIN docs/assets/img/examples/bootstrap-example-fluid.jpg
  21. BIN docs/assets/img/examples/bootstrap-example-fluid.png
  22. BIN docs/assets/img/examples/bootstrap-example-hero.jpg
  23. BIN docs/assets/img/examples/bootstrap-example-justified-nav.png
  24. BIN docs/assets/img/examples/bootstrap-example-marketing-narrow.png
  25. BIN docs/assets/img/examples/bootstrap-example-marketing.png
  26. BIN docs/assets/img/examples/bootstrap-example-signin.png
  27. BIN docs/assets/img/examples/bootstrap-example-starter.jpg
  28. BIN docs/assets/img/examples/bootstrap-example-starter.png
  29. BIN docs/assets/img/examples/bootstrap-example-sticky-footer.png
  30. +12 −10 docs/assets/js/application.js
  31. +1 −1 docs/assets/js/bootstrap-affix.js
  32. +1 −1 docs/assets/js/bootstrap-alert.js
  33. +1 −1 docs/assets/js/bootstrap-button.js
  34. +31 −9 docs/assets/js/bootstrap-carousel.js
  35. +4 −4 docs/assets/js/bootstrap-collapse.js
  36. +14 −10 docs/assets/js/bootstrap-dropdown.js
  37. +13 −11 docs/assets/js/bootstrap-modal.js
  38. +5 −5 docs/assets/js/bootstrap-popover.js
  39. +2 −2 docs/assets/js/bootstrap-scrollspy.js
  40. +1 −1 docs/assets/js/bootstrap-tab.js
  41. +95 −29 docs/assets/js/bootstrap-tooltip.js
  42. +1 −1 docs/assets/js/bootstrap-transition.js
  43. +16 −4 docs/assets/js/bootstrap-typeahead.js
  44. +189 −80 docs/assets/js/bootstrap.js
  45. +2 −2 docs/assets/js/bootstrap.min.js
  46. +113 −54 docs/assets/js/holder/holder.js
  47. +8 −0 docs/assets/js/html5shiv.js
  48. +5 −2 docs/assets/js/jquery.js
  49. +31 −9 docs/base-css.html
  50. +28 −8 docs/components.html
  51. +2 −2 docs/customize.html
  52. +8 −6 docs/examples/carousel.html
  53. +14 −5 docs/examples/fluid.html
  54. +5 −5 docs/examples/hero.html
  55. +4 −2 docs/examples/{marketing-alternate.html → justified-nav.html}
  56. +2 −2 docs/examples/marketing-narrow.html
  57. +1 −1 docs/examples/signin.html
  58. +3 −3 docs/examples/starter-template.html
  59. +161 −0 docs/examples/sticky-footer-navbar.html
  60. +2 −1 docs/examples/sticky-footer.html
  61. +3 −11 docs/extend.html
  62. +18 −9 docs/getting-started.html
  63. +3 −3 docs/index.html
  64. +81 −60 docs/javascript.html
  65. +2 −2 docs/scaffolding.html
  66. +2 −2 docs/templates/layout.mustache
  67. +29 −7 docs/templates/pages/base-css.mustache
  68. +26 −6 docs/templates/pages/components.mustache
  69. +1 −9 docs/templates/pages/extend.mustache
  70. +16 −7 docs/templates/pages/getting-started.mustache
  71. +2 −2 docs/templates/pages/index.mustache
  72. +79 −58 docs/templates/pages/javascript.mustache
  73. +1 −1 js/bootstrap-affix.js
  74. +1 −1 js/bootstrap-alert.js
  75. +1 −1 js/bootstrap-button.js
  76. +31 −9 js/bootstrap-carousel.js
  77. +4 −4 js/bootstrap-collapse.js
  78. +14 −10 js/bootstrap-dropdown.js
  79. +13 −11 js/bootstrap-modal.js
  80. +5 −5 js/bootstrap-popover.js
  81. +2 −2 js/bootstrap-scrollspy.js
  82. +1 −1 js/bootstrap-tab.js
  83. +95 −29 js/bootstrap-tooltip.js
  84. +1 −1 js/bootstrap-transition.js
  85. +16 −4 js/bootstrap-typeahead.js
  86. +12 −0 js/tests/unit/bootstrap-carousel.js
  87. +138 −3 js/tests/unit/bootstrap-tooltip.js
  88. +5 −0 js/tests/unit/bootstrap-typeahead.js
  89. +5 −2 js/tests/vendor/jquery.js
  90. +4 −2 lib/_button-groups.scss
  91. +8 −10 lib/_buttons.scss
  92. +33 −6 lib/_carousel.scss
  93. +2 −1 lib/_close.scss
  94. +16 −12 lib/_dropdowns.scss
  95. +5 −2 lib/_forms.scss
  96. +4 −2 lib/_labels-badges.scss
  97. +2 −2 lib/_media.scss
  98. +6 −0 lib/_mixins.scss
  99. +3 −3 lib/_modals.scss
  100. +18 −11 lib/_navbar.scss
  101. +40 −22 lib/_navs.scss
  102. +3 −1 lib/_pager.scss
  103. +3 −1 lib/_pagination.scss
  104. +5 −1 lib/_popovers.scss
  105. +6 −2 lib/_responsive-navbar.scss
  106. +29 −13 lib/_responsive-utilities.scss
  107. +2 −1 lib/_scaffolding.scss
  108. +7 −3 lib/_sprites.scss
  109. +24 −17 lib/_tables.scss
  110. +3 −2 lib/_thumbnails.scss
  111. +6 −6 lib/_tooltip.scss
  112. +20 −8 lib/_type.scss
  113. +1 −1 lib/_variables.scss
  114. +1 −1 lib/bootstrap.scss
  115. +1 −10 lib/responsive.scss
  116. +12 −1 lib/tests/css-tests.css
  117. +54 −0 lib/tests/css-tests.html
  118. +5 −5 package.json
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -3,7 +3,7 @@ GEM
specs:
rake (0.9.2.2)
rb-fsevent (0.9.1)
- sass (3.2.1)
+ sass (3.2.5)
PLATFORMS
ruby
View
352 LICENSE

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -18,17 +18,17 @@ build:
@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}
+ @./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
+ @./node_modules/.bin/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 js/bootstrap-affix.js > docs/assets/js/bootstrap.js
- @uglifyjs docs/assets/js/bootstrap.js -nc > docs/assets/js/bootstrap.min.tmp.js
- @echo "/**\n* Bootstrap.js v2.2.2 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
+ @./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
+ @echo "/**\n* Bootstrap.js v2.3.0 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"
@@ -43,8 +43,8 @@ build:
#
test:
- jshint js/*.js --config js/.jshintrc
- jshint js/tests/unit/*.js --config js/.jshintrc
+ ./node_modules/.bin/jshint js/*.js --config js/.jshintrc
+ ./node_modules/.bin/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`
@@ -62,21 +62,46 @@ clean:
# recess & uglifyjs are required
#
-bootstrap:
- mkdir -p bootstrap/img
- mkdir -p bootstrap/css
+bootstrap: bootstrap-img bootstrap-css bootstrap-js
+
+
+#
+# JS COMPILE
+#
+bootstrap-js: bootstrap/js/*.js
+
+bootstrap/js/*.js: js/*.js
mkdir -p bootstrap/js
- cp img/* bootstrap/img/
- 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 js/bootstrap-affix.js > bootstrap/js/bootstrap.js
- uglifyjs bootstrap/js/bootstrap.js -nc > bootstrap/js/bootstrap.min.tmp.js
+ ./node_modules/.bin/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
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
+#
+# CSS COMPLILE
+#
+
+bootstrap-css: bootstrap/css/*.css
+
+bootstrap/css/*.css: less/*.less
+ mkdir -p bootstrap/css
+ ./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
+ ./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
+ ./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
+ ./node_modules/.bin/recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
+
+#
+# IMAGES
+#
+
+bootstrap-img: bootstrap/img/*
+
+bootstrap/img/*: img/*
+ mkdir -p bootstrap/img
+ cp img/* bootstrap/img/
+
+
#
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
@@ -98,4 +123,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
-.PHONY: docs watch gh-pages
+.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
View
@@ -1,8 +1,12 @@
-# [Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
+<a href="http://getbootstrap.com">
+ <img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
+</a>
+
+# [Bootstrap v2.3.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
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).
-To get started, checkout http://getbootstrap.com!
+To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)!
@@ -22,7 +26,7 @@ You can use the SASS Twitter Bootstrap by dropping the compiled CSS into any new
Because SASS always outputs standard css, just link to the final output like normal:
-`<link rel="stylesheet" type="text/css" href="bootstrap-2.2.2.css">`
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.3.0.css">`
For more info, refer to the docs!
@@ -34,7 +38,7 @@ You can learn more about SASS at:
[sass-lang.com](http://sass-lang.com)
-SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.2.2.css`
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.3.0.css`
@@ -52,7 +56,7 @@ And constructed with the following guidelines:
* 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/.
+For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
@@ -120,13 +124,13 @@ Thanks!
**Mark Otto**
-+ http://twitter.com/mdo
-+ http://github.com/mdo
++ [http://twitter.com/mdo](http://twitter.com/mdo)
++ [http://github.com/mdo](http://github.com/mdo)
**Jacob Thornton**
-+ http://twitter.com/fat
-+ http://github.com/fat
++ [http://twitter.com/fat](http://twitter.com/fat)
++ [http://github.com/fat](http://github.com/fat)
@@ -183,7 +187,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License in the LICENSE file, or at:
- http://www.apache.org/licenses/LICENSE-2.0
+ [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
View
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-VERSION = "2.2.2"
+VERSION = "2.3.0"
BOOTSTRAP_CSS = "bootstrap-#{VERSION}.css"
BOOTSTRAP_MIN_CSS = "bootstrap-#{VERSION}.min.css"
BOOTSTRAP_RESPONSIVE_CSS = "bootstrap-responsive-#{VERSION}.css"
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 6ba9482

Please sign in to comment.