Permalink
Browse files

merges with bootstrap 2.3.0

  • Loading branch information...
2 parents 0558fed + 8c7f9c6 commit a6770a1454c5379ecff7d435003bb32246cf869c @iCEAGE iCEAGE committed Feb 10, 2013
Showing with 2,384 additions and 817 deletions.
  1. +350 −0 CHANGELOG.md
  2. +44 −19 Makefile
  3. +19 −5 README.md
  4. +1 −1 component.json
  5. +0 −1 composer.json
  6. +24 −7 docs/assets/css/bootstrap-responsive.css
  7. +238 −119 docs/assets/css/bootstrap.css
  8. +5 −2 docs/assets/css/docs.css
  9. BIN docs/assets/img/bootstrap-docs-readme.png
  10. BIN docs/assets/img/examples/bootstrap-example-fluid.jpg
  11. BIN docs/assets/img/examples/bootstrap-example-fluid.png
  12. BIN docs/assets/img/examples/bootstrap-example-hero.jpg
  13. BIN docs/assets/img/examples/bootstrap-example-justified-nav.png
  14. BIN docs/assets/img/examples/bootstrap-example-marketing.png
  15. BIN docs/assets/img/examples/bootstrap-example-starter.jpg
  16. BIN docs/assets/img/examples/bootstrap-example-starter.png
  17. +12 −10 docs/assets/js/application.js
  18. +1 −1 docs/assets/js/bootstrap-affix.js
  19. +1 −1 docs/assets/js/bootstrap-alert.js
  20. +1 −1 docs/assets/js/bootstrap-button.js
  21. +31 −9 docs/assets/js/bootstrap-carousel.js
  22. +4 −4 docs/assets/js/bootstrap-collapse.js
  23. +14 −10 docs/assets/js/bootstrap-dropdown.js
  24. +13 −11 docs/assets/js/bootstrap-modal.js
  25. +5 −5 docs/assets/js/bootstrap-popover.js
  26. +2 −2 docs/assets/js/bootstrap-scrollspy.js
  27. +1 −1 docs/assets/js/bootstrap-tab.js
  28. +95 −29 docs/assets/js/bootstrap-tooltip.js
  29. +1 −1 docs/assets/js/bootstrap-transition.js
  30. +16 −4 docs/assets/js/bootstrap-typeahead.js
  31. +189 −80 docs/assets/js/bootstrap.js
  32. +3 −20 docs/assets/js/bootstrap.min.js
  33. +113 −54 docs/assets/js/holder/holder.js
  34. +8 −0 docs/assets/js/html5shiv.js
  35. +5 −2 docs/assets/js/jquery.js
  36. +30 −5 docs/base-css.html
  37. +24 −3 docs/components.html
  38. +4 −2 docs/customize.html
  39. +6 −4 docs/examples/carousel.html
  40. +13 −4 docs/examples/fluid.html
  41. +4 −4 docs/examples/hero.html
  42. +3 −1 docs/examples/{marketing-alternate.html → justified-nav.html}
  43. +1 −1 docs/examples/marketing-narrow.html
  44. +1 −1 docs/examples/signin.html
  45. +3 −2 docs/examples/starter-template.html
  46. +161 −0 docs/examples/sticky-footer-navbar.html
  47. +2 −1 docs/examples/sticky-footer.html
  48. +5 −11 docs/extend.html
  49. +20 −9 docs/getting-started.html
  50. +5 −3 docs/index.html
  51. +81 −58 docs/javascript.html
  52. +4 −2 docs/scaffolding.html
  53. +4 −2 docs/templates/layout.mustache
  54. +26 −3 docs/templates/pages/base-css.mustache
  55. +20 −1 docs/templates/pages/components.mustache
  56. +1 −9 docs/templates/pages/extend.mustache
  57. +16 −7 docs/templates/pages/getting-started.mustache
  58. +2 −2 docs/templates/pages/index.mustache
  59. +77 −56 docs/templates/pages/javascript.mustache
  60. +1 −1 js/bootstrap-affix.js
  61. +1 −1 js/bootstrap-alert.js
  62. +1 −1 js/bootstrap-button.js
  63. +31 −9 js/bootstrap-carousel.js
  64. +4 −4 js/bootstrap-collapse.js
  65. +14 −10 js/bootstrap-dropdown.js
  66. +13 −11 js/bootstrap-modal.js
  67. +5 −5 js/bootstrap-popover.js
  68. +2 −2 js/bootstrap-scrollspy.js
  69. +1 −1 js/bootstrap-tab.js
  70. +95 −29 js/bootstrap-tooltip.js
  71. +1 −1 js/bootstrap-transition.js
  72. +16 −4 js/bootstrap-typeahead.js
  73. +12 −0 js/tests/unit/bootstrap-carousel.js
  74. +138 −3 js/tests/unit/bootstrap-tooltip.js
  75. +5 −0 js/tests/unit/bootstrap-typeahead.js
  76. +5 −2 js/tests/vendor/jquery.js
  77. +4 −4 less/bootstrap.less
  78. +4 −2 less/button-groups.less
  79. +8 −10 less/buttons.less
  80. +34 −7 less/carousel.less
  81. +2 −1 less/close.less
  82. +16 −12 less/dropdowns.less
  83. +5 −2 less/forms.less
  84. +4 −2 less/labels-badges.less
  85. +2 −2 less/media.less
  86. +24 −8 less/mixins.less
  87. +20 −13 less/navbar.less
  88. +39 −21 less/navs.less
  89. +3 −1 less/pager.less
  90. +3 −1 less/pagination.less
  91. +5 −1 less/popovers.less
  92. +2 −2 less/responsive-767px-max.less
  93. +6 −2 less/responsive-navbar.less
  94. +16 −0 less/responsive-utilities.less
  95. +1 −10 less/responsive.less
  96. +2 −1 less/scaffolding.less
  97. +7 −3 less/sprites.less
  98. +24 −17 less/tables.less
  99. +12 −1 less/tests/css-tests.css
  100. +54 −0 less/tests/css-tests.html
  101. +3 −2 less/thumbnails.less
  102. +6 −6 less/tooltip.less
  103. +19 −7 less/type.less
  104. +1 −1 less/variables.less
  105. +4 −4 package.json
View
Oops, something went wrong.
View
@@ -18,33 +18,33 @@ 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 @jnaqsh\n* Copyright 2012 Naqsh Jahan Toos, Inc. based on twitter bootstrap, which is 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"
@echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}."
@echo "${HR}\n"
@echo "Thanks for using Bootstrap,"
- @echo "<3 @jnaqsh\n"
+ @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_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,23 +62,48 @@ 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
- echo "/*!\n* Bootstrap.js by @jnaqsh\n* Copyright 2012 Naqsh Jahan Toos, Inc. which is Copyright 2012 Twitter Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.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
#
-# MAKE FOR GH-PAGES 4 jnaqsh ONLY (O_O )
+# 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 )
#
gh-pages: bootstrap docs
@@ -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 RTL v2.2.2](http://jnaqsh.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
+<a href="http://rbootstrap.ir">
+ <img src="http://jnaqsh.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
+</a>
+
+# [Twitter Bootstrap RTL v2.3.0](http://jnaqsh.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 by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter originally and make compatible with RTL languages by Hamed Ramezanian at Naqsh Jahan Toos Inc.
-To get started, checkout http://rbootstrap.ir!
+To get started, checkout [http://rbootstrap.ir](http://rbootstrap.ir)!
@@ -30,7 +34,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/).
@@ -86,7 +90,17 @@ Thanks!
**Hamed Ramezanian**
-+ http://github.com/iCEAGE
++ [http://github.com/iCEAGE](http://github.com/iCEAGE)
+
+**Mark Otto**
+
++ [http://twitter.com/mdo](http://twitter.com/mdo)
++ [http://github.com/mdo](http://github.com/mdo)
+
+**Jacob Thornton**
+
++ [http://twitter.com/fat](http://twitter.com/fat)
++ [http://github.com/fat](http://github.com/fat)
@@ -98,7 +112,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
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
- "version": "2.2.2",
+ "version": "2.3.0",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"
View
@@ -5,6 +5,5 @@
, "homepage": "http://jnaqsh.github.com/bootstrap/"
, "author": "Naqsh Inc."
, "license": "Apache-2.0"
- , "target-dir": "jnaqsh/bootstrap"
}
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.2.2
+ * Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -8,10 +8,6 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
-@-ms-viewport {
- width: device-width;
-}
-
.clearfix {
*zoom: 1;
}
@@ -44,6 +40,10 @@
box-sizing: border-box;
}
+@-ms-viewport {
+ width: device-width;
+}
+
.hidden {
display: none;
visibility: hidden;
@@ -95,6 +95,19 @@
}
}
+.visible-print {
+ display: none !important;
+}
+
+@media print {
+ .visible-print {
+ display: inherit !important;
+ }
+ .hidden-print {
+ display: none !important;
+ }
+}
+
@media (min-width: 1200px) {
.row {
margin-right: -30px;
@@ -1003,15 +1016,19 @@
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
- .nav-collapse .dropdown-menu a:hover {
+ .nav-collapse .nav > li > a:focus,
+ .nav-collapse .dropdown-menu a:hover,
+ .nav-collapse .dropdown-menu a:focus {
background-color: #f2f2f2;
}
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
color: #999999;
}
.navbar-inverse .nav-collapse .nav > li > a:hover,
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: #111111;
}
.nav-collapse.in .btn-group {
Oops, something went wrong.

0 comments on commit a6770a1

Please sign in to comment.