root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.1-wip 

Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-01 22:52:07 -08:00
parent 58fd0dea36 98d1659ef8
commit aa8a7668cb
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,6 +10,7 @@ WATCHR ?= `which watchr`
# #
docs: bootstrap docs: bootstrap
rm docs/assets/bootstrap.zip
zip -r docs/assets/bootstrap.zip bootstrap zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap rm -r bootstrap
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP} lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@ -42,6 +43,7 @@ bootstrap:
# #
gh-pages: docs gh-pages: docs
rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
node docs/build production node docs/build production
cp -r docs/* ../bootstrap-gh-pages cp -r docs/* ../bootstrap-gh-pages

6
README.md
View File

@ -9,7 +9,7 @@ To get started -- checkout http://twitter.github.com/bootstrap!
Versioning Versioning
---------- ----------
For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
Releases will be numbered with the follow format: Releases will be numbered with the follow format:
@ -17,8 +17,8 @@ Releases will be numbered with the follow format:
And constructed with the following guidelines: And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major * Breaking backward compatibility bumps the major
* New additions without breaking backwards compatibility bumps the minor * New additions without breaking backward compatibility bumps the minor
* Bug fixes and misc changes bump the patch * Bug fixes and misc changes bump the patch
For more information on SemVer, please visit http://semver.org/. For more information on SemVer, please visit http://semver.org/.

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

3
docs/assets/js/application.js
View File

@ -135,8 +135,7 @@
, url: 'http://bootstrap.herokuapp.com' , url: 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi' , dataType: 'jsonpi'
, params: { , params: {
branch: '2.0-wip' js: js
, js: js
, css: css , css: css
, vars: vars , vars: vars
, img: img , img: img