Permalink
Browse files

Merge pull request #25 from m5o/2.0.4-wip

update to bootstrap v2.0.4
  • Loading branch information...
m5o committed Jun 1, 2012
2 parents 07cc4d1 + 7d9b38d commit cd0703b8aa335d01130d7e9d581cbb12013b9ad0
Showing with 2,085 additions and 7,545 deletions.
  1. +1 −1 Gemfile.lock
  2. +57 −16 README.md
  3. +1 −1 Rakefile
  4. +0 −9 bootstrap-2.0.3.min.css
  5. +156 −140 bootstrap-2.0.3.css → bootstrap-2.0.4.css
  6. +9 −0 bootstrap-2.0.4.min.css
  7. +0 −9 bootstrap-responsive-2.0.3.min.css
  8. +12 −3 bootstrap-responsive-2.0.3.css → bootstrap-responsive-2.0.4.css
  9. +9 −0 bootstrap-responsive-2.0.4.min.css
  10. +0 −808 docs/assets/css/bootstrap-responsive.css
  11. +1 −0 docs/assets/css/bootstrap-responsive.css
  12. +0 −4,960 docs/assets/css/bootstrap.css
  13. +1 −0 docs/assets/css/bootstrap.css
  14. +5 −0 docs/assets/css/docs.css
  15. +1 −1 docs/assets/js/bootstrap-alert.js
  16. +1 −1 docs/assets/js/bootstrap-button.js
  17. +1 −1 docs/assets/js/bootstrap-carousel.js
  18. +1 −1 docs/assets/js/bootstrap-collapse.js
  19. +1 −1 docs/assets/js/bootstrap-dropdown.js
  20. +1 −1 docs/assets/js/bootstrap-modal.js
  21. +1 −1 docs/assets/js/bootstrap-popover.js
  22. +1 −1 docs/assets/js/bootstrap-scrollspy.js
  23. +1 −1 docs/assets/js/bootstrap-tab.js
  24. +3 −3 docs/assets/js/bootstrap-tooltip.js
  25. +1 −1 docs/assets/js/bootstrap-transition.js
  26. +1 −1 docs/assets/js/bootstrap-typeahead.js
  27. +15 −14 docs/assets/js/bootstrap.js
  28. +1 −1 docs/assets/js/bootstrap.min.js
  29. +9 −6 docs/base-css.html
  30. +11 −10 docs/components.html
  31. +4 −3 docs/download.html
  32. +3 −2 docs/examples.html
  33. +5 −4 docs/index.html
  34. +37 −60 docs/javascript.html
  35. +500 −493 docs/less.html
  36. +28 −28 docs/scaffolding.html
  37. +15 −2 docs/templates/layout.mustache
  38. +6 −4 docs/templates/pages/base-css.mustache
  39. +9 −9 docs/templates/pages/components.mustache
  40. +1 −1 docs/templates/pages/download.mustache
  41. +2 −2 docs/templates/pages/index.mustache
  42. +34 −58 docs/templates/pages/javascript.mustache
  43. +497 −491 docs/templates/pages/less.mustache
  44. +25 −26 docs/templates/pages/scaffolding.mustache
  45. +3 −2 docs/upgrading.html
  46. +5 −5 js/README.md
  47. +1 −1 js/bootstrap-alert.js
  48. +1 −1 js/bootstrap-button.js
  49. +1 −1 js/bootstrap-carousel.js
  50. +1 −1 js/bootstrap-collapse.js
  51. +1 −1 js/bootstrap-dropdown.js
  52. +1 −1 js/bootstrap-modal.js
  53. +1 −1 js/bootstrap-popover.js
  54. +1 −1 js/bootstrap-scrollspy.js
  55. +1 −1 js/bootstrap-tab.js
  56. +3 −3 js/bootstrap-tooltip.js
  57. +1 −1 js/bootstrap-transition.js
  58. +1 −1 js/bootstrap-typeahead.js
  59. +31 −12 js/tests/unit/bootstrap-tooltip.js
  60. +0 −3 lib/_accordion.scss
  61. +0 −4 lib/_alerts.scss
  62. +0 −5 lib/_breadcrumbs.scss
  63. +2 −8 lib/_button-groups.scss
  64. +2 −8 lib/_buttons.scss
  65. +0 −4 lib/_carousel.scss
  66. +0 −4 lib/_close.scss
  67. +1 −6 lib/_code.scss
  68. +0 −3 lib/_component-animations.scss
  69. +0 −4 lib/_dropdowns.scss
  70. +92 −99 lib/_forms.scss
  71. +0 −5 lib/_grid.scss
  72. +0 −4 lib/_hero-unit.scss
  73. +11 −16 lib/_labels-badges.scss
  74. +0 −3 lib/_layouts.scss
  75. +34 −31 lib/_mixins.scss
  76. +1 −7 lib/_modals.scss
  77. +5 −19 lib/_navbar.scss
  78. +1 −3 lib/_navs.scss
  79. +0 −4 lib/_pager.scss
  80. +0 −4 lib/_pagination.scss
  81. +0 −4 lib/_popovers.scss
  82. +0 −3 lib/_progress-bars.scss
  83. +6 −4 lib/_reset.scss
  84. +0 −3 lib/_responsive-1200px-min.scss
  85. +0 −4 lib/_responsive-767px-max.scss
  86. +0 −3 lib/_responsive-768px-979px.scss
  87. +10 −8 lib/_responsive-navbar.scss
  88. +0 −3 lib/_responsive-utilities.scss
  89. +0 −2 lib/_scaffolding.scss
  90. +0 −3 lib/_sprites.scss
  91. +1 −5 lib/_tables.scss
  92. +0 −4 lib/_thumbnails.scss
  93. +0 −4 lib/_tooltip.scss
  94. +2 −9 lib/_type.scss
  95. +0 −3 lib/_utilities.scss
  96. +2 −6 lib/_variables.scss
  97. +0 −3 lib/_wells.scss
  98. +1 −5 lib/bootstrap.scss
  99. +2 −4 lib/responsive.scss
  100. +1 −0 lib/tests/css-tests.css
  101. +102 −12 lib/tests/css-tests.html
  102. +179 −0 lib/tests/forms.html
  103. +108 −0 lib/tests/navbar.html
  104. +1 −1 package.json
View
@@ -3,7 +3,7 @@ GEM
specs:
rake (0.9.2)
rb-fsevent (0.4.3.1)
- sass (3.1.10)
+ sass (3.1.19)
PLATFORMS
ruby
View
@@ -1,31 +1,41 @@
-TWITTER 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 is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
+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.
-To get started -- checkout http://twitter.github.com/bootstrap!
+To get started, checkout http://twitter.github.com/bootstrap!
-Usage
------
+
+Quick start
+-----------
+
+Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
+
+
+
+SASS: Usage
+-----------
You can use the SASS Twitter Bootstrap by dropping the compiled CSS into any new project and start cranking.
Because SASS always outputs standard css, just link to the final output like normal:
- <link rel="stylesheet" type="text/css" href="bootstrap-2.0.3.css">
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.0.4.css">`
For more info, refer to the docs!
-Basic modification
-------------------
+
+SASS: Basic modification
+------------------------
You can learn more about SASS at:
- http://sass-lang.com
+[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.0.4.css`
-SASS runs as a local GEM on your system. You can run "sass --watch lib/bootstrap.scss:bootstrap-2.0.3.css"
Versioning
@@ -39,21 +49,23 @@ 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/.
+
Bug tracker
-----------
-Have a bug? Please create an issue here on GitHub!
+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
https://github.com/twitter/bootstrap/issues
+
Twitter account
---------------
@@ -78,6 +90,7 @@ twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap
+
IRC
---
@@ -86,8 +99,9 @@ Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo)
-SASS Developers
----------------
+
+SASS: Developers
+----------------
We have included a Rakefile with convenience methods for working with the SASS Bootstrap library.
@@ -99,6 +113,7 @@ The lessc compiler is required for this command to run.
This is a convenience method for watching your Sass files and automatically building them whenever you save.
+
Developers
----------
@@ -121,6 +136,12 @@ Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on h
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!
+
+
Authors
-------
@@ -135,6 +156,7 @@ Authors
+ http://github.com/fat
+
Sass Conversion
---------------
@@ -158,6 +180,25 @@ The Twitter Bootstrap was lovingly converted to Sass by:
And [others](https://github.com/jlong/sass-twitter-bootstrap/contributors)
+
+Sass Conversion Quick Tips
+--------------------------
+
+* replace @ with $
+* replace . with @include for mixins
+* replace `spin` with `adjust-hue`
+* add !default to variable definitions
+* replace #gradient > .vertical with @include gradient-vertical
+* replace #grid > .style with @include grid-style
+* use grid-core and grid-fluid mixins instead of #grid > .core and #grid > .fluid
+* use font-shorthand instead of #font > .shorthand
+* replace fadein with fade-in
+* move @import for reset below mixins, because it uses tab-focus mixin in bootstrap.scss
+* explicitly provide .clearfix, .hide-text and .input-block-level for compatibility with LESS output
+* pass grid-* mixin arguments to generators, because otherwise the generator mixins will use the default variables pull transition definition into variable
+
+
+
Copyright and license
---------------------
View
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-VERSION = "2.0.3"
+VERSION = "2.0.4"
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 cd0703b

Please sign in to comment.