Permalink
Browse files

Merge pull request #36 from m5o/2.2.0-wip

update to match Bootstrap v2.2.0
  • Loading branch information...
2 parents 84051ad + 1d54142 commit 1464876bd36600a0159c6bb7af31f85719e339c0 @m5o m5o committed Oct 30, 2012
Showing with 4,048 additions and 1,117 deletions.
  1. +75 −0 CONTRIBUTING.md
  2. +1 −8 Makefile
  3. +5 −5 README.md
  4. +1 −1 Rakefile
  5. +0 −9 bootstrap-2.1.1.min.css
  6. +338 −212 bootstrap-2.1.1.css → bootstrap-2.2.0.css
  7. +9 −0 bootstrap-2.2.0.min.css
  8. +0 −9 bootstrap-responsive-2.1.1.min.css
  9. +37 −2 bootstrap-responsive-2.1.1.css → bootstrap-responsive-2.2.0.css
  10. +9 −0 bootstrap-responsive-2.2.0.min.css
  11. +8 −0 component.json
  12. +1 −1 docs/assets/css/bootstrap-responsive.css
  13. +1 −1 docs/assets/css/bootstrap.css
  14. +22 −8 docs/assets/css/docs.css
  15. BIN docs/assets/img/example-sites/8020select.png
  16. BIN docs/assets/img/example-sites/adoptahydrant.png
  17. BIN docs/assets/img/example-sites/breakingnews.png
  18. BIN docs/assets/img/example-sites/gathercontent.png
  19. BIN docs/assets/img/example-sites/kippt.png
  20. BIN docs/assets/img/examples/bootstrap-example-carousel.png
  21. BIN docs/assets/img/examples/bootstrap-example-marketing-narrow.png
  22. BIN docs/assets/img/examples/bootstrap-example-signin.png
  23. BIN docs/assets/img/examples/bootstrap-example-sticky-footer.png
  24. BIN docs/assets/img/examples/browser-icon-chrome.png
  25. BIN docs/assets/img/examples/browser-icon-firefox.png
  26. BIN docs/assets/img/examples/browser-icon-safari.png
  27. BIN docs/assets/img/examples/slide-01.jpg
  28. BIN docs/assets/img/examples/slide-02.jpg
  29. BIN docs/assets/img/examples/slide-03.jpg
  30. +4 −2 docs/assets/js/bootstrap-affix.js
  31. +2 −4 docs/assets/js/bootstrap-alert.js
  32. +5 −7 docs/assets/js/bootstrap-button.js
  33. +12 −12 docs/assets/js/bootstrap-carousel.js
  34. +9 −11 docs/assets/js/bootstrap-collapse.js
  35. +9 −11 docs/assets/js/bootstrap-dropdown.js
  36. +20 −25 docs/assets/js/bootstrap-modal.js
  37. +1 −1 docs/assets/js/bootstrap-popover.js
  38. +1 −1 docs/assets/js/bootstrap-scrollspy.js
  39. +5 −7 docs/assets/js/bootstrap-tab.js
  40. +12 −11 docs/assets/js/bootstrap-tooltip.js
  41. +5 −5 docs/assets/js/bootstrap-transition.js
  42. +19 −9 docs/assets/js/bootstrap-typeahead.js
  43. +105 −107 docs/assets/js/bootstrap.js
  44. +2 −2 docs/assets/js/bootstrap.min.js
  45. +2 −4 docs/assets/js/jquery.js
  46. +176 −40 docs/base-css.html
  47. +1 −1 docs/build/index.js
  48. +304 −41 docs/components.html
  49. +41 −8 docs/customize.html
  50. +442 −0 docs/examples/carousel.html
  51. +2 −2 docs/examples/fluid.html
  52. +2 −2 docs/examples/hero.html
  53. +172 −0 docs/examples/marketing-alternate.html
  54. +137 −0 docs/examples/marketing-narrow.html
  55. +94 −0 docs/examples/signin.html
  56. +2 −2 docs/examples/starter-template.html
  57. +124 −0 docs/examples/sticky-footer.html
  58. +22 −20 docs/extend.html
  59. +51 −20 docs/getting-started.html
  60. +27 −14 docs/index.html
  61. +41 −23 docs/javascript.html
  62. +14 −12 docs/scaffolding.html
  63. +8 −6 docs/templates/layout.mustache
  64. +167 −33 docs/templates/pages/base-css.mustache
  65. +296 −35 docs/templates/pages/components.mustache
  66. +32 −1 docs/templates/pages/customize.mustache
  67. +13 −13 docs/templates/pages/extend.mustache
  68. +42 −13 docs/templates/pages/getting-started.mustache
  69. +20 −9 docs/templates/pages/index.mustache
  70. +32 −16 docs/templates/pages/javascript.mustache
  71. +5 −5 docs/templates/pages/scaffolding.mustache
  72. +4 −2 js/bootstrap-affix.js
  73. +2 −4 js/bootstrap-alert.js
  74. +5 −7 js/bootstrap-button.js
  75. +12 −12 js/bootstrap-carousel.js
  76. +9 −11 js/bootstrap-collapse.js
  77. +9 −11 js/bootstrap-dropdown.js
  78. +20 −25 js/bootstrap-modal.js
  79. +1 −1 js/bootstrap-popover.js
  80. +1 −1 js/bootstrap-scrollspy.js
  81. +5 −7 js/bootstrap-tab.js
  82. +12 −11 js/bootstrap-tooltip.js
  83. +5 −5 js/bootstrap-transition.js
  84. +19 −9 js/bootstrap-typeahead.js
  85. +22 −1 js/tests/unit/bootstrap-carousel.js
  86. +41 −1 js/tests/unit/bootstrap-dropdown.js
  87. +4 −4 js/tests/unit/bootstrap-popover.js
  88. +19 −0 js/tests/unit/bootstrap-tab.js
  89. +17 −8 js/tests/unit/bootstrap-tooltip.js
  90. +6 −11 js/tests/unit/bootstrap-typeahead.js
  91. +2 −4 js/tests/vendor/jquery.js
  92. +1 −1 lib/_accordion.scss
  93. +1 −1 lib/_alerts.scss
  94. +1 −1 lib/_breadcrumbs.scss
  95. +3 −6 lib/_button-groups.scss
  96. +16 −15 lib/_buttons.scss
  97. +1 −1 lib/_code.scss
  98. +2 −2 lib/_component-animations.scss
  99. +32 −5 lib/_dropdowns.scss
  100. +43 −11 lib/_forms.scss
  101. +6 −5 lib/_hero-unit.scss
  102. +4 −2 lib/_labels-badges.scss
  103. +55 −0 lib/_media.scss
  104. +9 −4 lib/_mixins.scss
  105. +7 −10 lib/_modals.scss
  106. +6 −8 lib/_navbar.scss
  107. +5 −4 lib/_navs.scss
  108. +10 −9 lib/_pager.scss
  109. +69 −12 lib/_pagination.scss
  110. +2 −2 lib/_popovers.scss
  111. +1 −1 lib/_progress-bars.scss
  112. +6 −4 lib/_reset.scss
  113. +20 −1 lib/_responsive-767px-max.scss
  114. +10 −2 lib/_responsive-navbar.scss
  115. +1 −3 lib/_scaffolding.scss
  116. +3 −3 lib/_sprites.scss
  117. +12 −8 lib/_tables.scss
  118. +1 −1 lib/_thumbnails.scss
  119. +1 −1 lib/_tooltip.scss
  120. +30 −24 lib/_type.scss
  121. +25 −2 lib/_variables.scss
  122. +3 −3 lib/_wells.scss
  123. +2 −1 lib/bootstrap.scss
  124. +1 −1 lib/responsive.scss
  125. +139 −0 lib/tests/buttons.html
  126. +71 −0 lib/tests/forms-responsive.html
  127. +104 −0 lib/tests/navbar-fixed-top.html
  128. +107 −0 lib/tests/navbar-static-top.html
  129. +35 −36 lib/tests/navbar.html
  130. +1 −1 package.json
View
@@ -0,0 +1,75 @@
+# Contributing to Bootstrap
+
+Looking to contribute something to Bootstrap? **Here's how you can help.**
+
+
+
+## Reporting issues
+
+We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
+
+1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
+2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test cases](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
+3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
+4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
+
+
+
+## Key branches
+
+- `master` is the latest, deployed version.
+- `gh-pages` is the hosted docs (not to be used for pull requests).
+- `*-wip` is the official work in progress branch for the next release.
+
+
+
+## Notes on the repo
+
+As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and built via `make` before each commit and release. This was done to enable internationalization (translation) in a future release by uploading our strings to the [Twitter Translation Center](http://translate.twttr.com/). Any edits to the docs should be first done in the Mustache files and then recompiled into the HTML.
+
+
+
+## Pull requests
+
+- Try to submit pull requests against the latest `*-wip` branch for easier merging
+- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
+- CSS changes must be done in .less files first, never just the compiled files
+- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
+- Try not to pollute your pull request with unintended changes--keep them simple and small
+- Try to share which browsers your code has been tested in before submitting a pull request
+
+
+
+## Coding standards: HTML
+
+- Two spaces for indentation, never tabs
+- Double quotes only, never single quotes
+- Always use proper indentation
+- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
+
+
+
+## Coding standards: CSS
+
+- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
+- Multiple-line approach (one property and value per line)
+- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
+- End all lines with a semi-colon
+- For multiple, comma-separated selectors, place each selector on it's own line
+- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
+
+
+
+## Coding standards: JS
+
+- No semicolons
+- Comma first
+- 2 spaces (no tabs)
+- strict mode
+- "Attractive"
+
+
+
+## License
+
+By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twitter/bootstrap/blob/master/LICENSE
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 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
+ @echo "/**\n* Bootstrap.js v2.2.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"
@@ -97,12 +97,5 @@ 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,7 +1,7 @@
[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 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.
+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!
@@ -10,7 +10,7 @@ To get started, checkout http://getbootstrap.com!
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).
+Clone the repo, `git clone git://github.com/twitter/bootstrap.git`, [download the latest release](https://github.com/twitter/bootstrap/zipball/master), or install with twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`.
@@ -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.1.css">`
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.2.0.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.1.css`
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.2.0.css`
@@ -127,7 +127,7 @@ $ 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>
+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/extend.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test`
Runs jshint and qunit tests headlessly in [phantomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
View
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-VERSION = "2.1.1"
+VERSION = "2.2.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 1464876

Please sign in to comment.