Permalink
Browse files

Merge pull request #29 from m5o/2.1.1-wip

update to Bootstrap 2.1.1
  • Loading branch information...
2 parents 40f1ef4 + f56f32f commit e037333b3b8c525d7bb7a8cc06b33fa8509a7617 @m5o m5o committed Sep 5, 2012
Showing with 1,054 additions and 1,387 deletions.
  1. +9 −2 Makefile
  2. +3 −3 README.md
  3. +1 −1 Rakefile
  4. +0 −9 bootstrap-2.1.0.min.css
  5. +217 −83 bootstrap-2.1.0.css → bootstrap-2.1.1.css
  6. +9 −0 bootstrap-2.1.1.min.css
  7. +0 −9 bootstrap-responsive-2.1.0.min.css
  8. +25 −8 bootstrap-responsive-2.1.0.css → bootstrap-responsive-2.1.1.css
  9. +9 −0 bootstrap-responsive-2.1.1.min.css
  10. +1 −1 docs/assets/css/bootstrap-responsive.css
  11. +1 −1 docs/assets/css/bootstrap.css
  12. +10 −31 docs/assets/css/docs.css
  13. +1 −1 docs/assets/js/bootstrap-affix.js
  14. +1 −1 docs/assets/js/bootstrap-alert.js
  15. +2 −2 docs/assets/js/bootstrap-button.js
  16. +1 −1 docs/assets/js/bootstrap-carousel.js
  17. +1 −1 docs/assets/js/bootstrap-collapse.js
  18. +3 −3 docs/assets/js/bootstrap-dropdown.js
  19. +1 −1 docs/assets/js/bootstrap-modal.js
  20. +1 −1 docs/assets/js/bootstrap-popover.js
  21. +1 −1 docs/assets/js/bootstrap-scrollspy.js
  22. +1 −1 docs/assets/js/bootstrap-tab.js
  23. +1 −1 docs/assets/js/bootstrap-tooltip.js
  24. +1 −1 docs/assets/js/bootstrap-transition.js
  25. +2 −2 docs/assets/js/bootstrap-typeahead.js
  26. +17 −17 docs/assets/js/bootstrap.js
  27. +2 −2 docs/assets/js/bootstrap.min.js
  28. +49 −11 docs/base-css.html
  29. +13 −3 docs/components.html
  30. +0 −63 docs/components/alert.html
  31. +0 −66 docs/components/breadcrumb.html
  32. +0 −71 docs/components/button-group.html
  33. +0 −61 docs/components/button.html
  34. +0 −66 docs/components/dropdown.html
  35. +0 −100 docs/components/form.html
  36. +0 −60 docs/components/icon.html
  37. +0 −72 docs/components/modal.html
  38. +0 −77 docs/components/nav.html
  39. +0 −70 docs/components/pagination.html
  40. +0 −62 docs/components/popover.html
  41. +0 −62 docs/components/progress-bar.html
  42. +0 −89 docs/components/table.html
  43. +0 −62 docs/components/tooltip.html
  44. +8 −3 docs/getting-started.html
  45. +1 −1 docs/index.html
  46. +35 −5 docs/javascript.html
  47. +24 −26 docs/scaffolding.html
  48. +49 −11 docs/templates/pages/base-css.mustache
  49. +13 −3 docs/templates/pages/components.mustache
  50. +15 −10 docs/templates/pages/getting-started.mustache
  51. +2 −2 docs/templates/pages/index.mustache
  52. +35 −5 docs/templates/pages/javascript.mustache
  53. +24 −26 docs/templates/pages/scaffolding.mustache
  54. +1 −1 js/bootstrap-affix.js
  55. +1 −1 js/bootstrap-alert.js
  56. +2 −2 js/bootstrap-button.js
  57. +1 −1 js/bootstrap-carousel.js
  58. +1 −1 js/bootstrap-collapse.js
  59. +3 −3 js/bootstrap-dropdown.js
  60. +1 −1 js/bootstrap-modal.js
  61. +1 −1 js/bootstrap-popover.js
  62. +1 −1 js/bootstrap-scrollspy.js
  63. +1 −1 js/bootstrap-tab.js
  64. +1 −1 js/bootstrap-tooltip.js
  65. +1 −1 js/bootstrap-transition.js
  66. +2 −2 js/bootstrap-typeahead.js
  67. +20 −1 js/tests/unit/bootstrap-button.js
  68. +18 −0 js/tests/unit/bootstrap-dropdown.js
  69. +1 −1 js/tests/unit/bootstrap-tooltip.js
  70. +1 −0 lib/_button-groups.scss
  71. +22 −2 lib/_buttons.scss
  72. +0 −1 lib/_component-animations.scss
  73. +2 −2 lib/_dropdowns.scss
  74. +25 −10 lib/_forms.scss
  75. +17 −8 lib/_mixins.scss
  76. +3 −2 lib/_modals.scss
  77. +17 −9 lib/_navbar.scss
  78. +6 −3 lib/_pager.scss
  79. +17 −17 lib/_pagination.scss
  80. +5 −2 lib/_reset.scss
  81. +27 −20 lib/_responsive-767px-max.scss
  82. +11 −0 lib/_responsive-navbar.scss
  83. +4 −1 lib/_scaffolding.scss
  84. +8 −2 lib/_sprites.scss
  85. +27 −6 lib/_tables.scss
  86. +18 −3 lib/_type.scss
  87. +9 −7 lib/_variables.scss
  88. +72 −0 lib/tests/css-tests.css
  89. +117 −1 lib/tests/css-tests.html
  90. +1 −1 package.json
View
@@ -28,7 +28,7 @@ build:
@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 -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
+ @echo "/**\n* Bootstrap.js v2.1.1 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"
@@ -51,6 +51,13 @@ test:
rm js/tests/pid.txt
#
+# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
+#
+
+clean:
+ rm -r bootstrap
+
+#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
#
@@ -64,7 +71,7 @@ bootstrap:
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
+ 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 -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
View
@@ -21,7 +21,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.1.0.css">`
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.1.1.css">`
For more info, refer to the docs!
@@ -34,7 +34,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.1.0.css`
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.1.1.css`
@@ -130,7 +130,7 @@ $ npm install recess connect uglify-js jshint -g
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 [phatomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+Runs jshint and qunit tests headlessly in [phantomjs] (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.
View
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-VERSION = "2.1.0"
+VERSION = "2.1.1"
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 e037333

Please sign in to comment.