Permalink
Browse files

changes 2.3.1 to 2.3.2 version

  • Loading branch information...
1 parent 30f0342 commit 6507355dd91b3aca1e363984ad8af2543ef65247 @iCEAGE iCEAGE committed Mar 28, 2013
Showing with 18 additions and 11 deletions.
  1. +8 −1 CHANGELOG.md
  2. +2 −2 Makefile
  3. +1 −1 README.md
  4. +2 −2 component.json
  5. +1 −1 docs/assets/js/bootstrap.min.js
  6. +3 −3 docs/index.html
  7. +1 −1 package.json
View
@@ -1,3 +1,10 @@
+## 2.3.2 (March 28, 2013)
+
+This patch comes from just rbootstrap not original twitter bootstrap
+
+- fix position of typeahead
+- adds nerdnews as example site
+
## 2.3.1 (February 28, 2013)
Patch release for @fat's n00bery
@@ -357,4 +364,4 @@ Complete rewrite of the library. For full details, head to the upgrading doc at
- Bug fixes
## v1.0.0
-- **Initial release**
+- **Initial release**
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
@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
- @echo "/**\n* Bootstrap.js v2.3.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.3.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
@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"
@@ -123,4 +123,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
-.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
+.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
View
@@ -2,7 +2,7 @@
<img src="http://jnaqsh.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
</a>
-# [Twitter Bootstrap RTL v2.3.1](http://jnaqsh.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
+# [Twitter Bootstrap RTL v2.3.2](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.
View
@@ -1,8 +1,8 @@
{
"name": "bootstrap",
- "version": "2.3.1",
+ "version": "2.3.2",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"
}
-}
+}
@@ -1,5 +1,5 @@
/**
-* Bootstrap.js v2.3.1 by @fat & @mdo
+* Bootstrap.js v2.3.2 by @fat & @mdo
* Copyright 2012 Twitter, Inc.
* http://www.apache.org/licenses/LICENSE-2.0.txt
*/
View
@@ -87,7 +87,7 @@
<a href="./extend.html" >توسعه دهید</a>
</li>
<li>
- نسخهٔ ۲.۳.۱
+ نسخهٔ ۲.۳.۲
</li>
</ul>
</div>
@@ -149,8 +149,8 @@
</a>
</li>
<li class="span3">
- <a class="thumbnail" href="http://kippt.com/" target="_blank">
- <img src="assets/img/example-sites/kippt.png" alt="Kippt">
+ <a class="thumbnail" href="http://nerdnews.ir/" target="_blank">
+ <img src="assets/img/example-sites/nerdnews.png" alt="farsi nerdnews">
</a>
</li>
<li class="span3">
View
@@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
- , "version": "2.3.1"
+ , "version": "2.3.2"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://jnaqsh.github.com/bootstrap/"
, "author": "Naqsh Jahan Toos Inc."

0 comments on commit 6507355

Please sign in to comment.