diff options
| author | Mark Otto <[email protected]> | 2012-01-29 16:42:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-29 16:42:37 -0800 |
| commit | b0976bb379d2c8826c13769a53f94079aa161c45 (patch) | |
| tree | 78000a54f3530355ee6fb23d4c35cfc5a7ded750 | |
| parent | 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 (diff) | |
| parent | 298e637d004c66a0e4351c7ce4a8d03866b75f66 (diff) | |
| download | bootstrap-b0976bb379d2c8826c13769a53f94079aa161c45.tar.xz bootstrap-b0976bb379d2c8826c13769a53f94079aa161c45.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/bootstrap.zip
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile | 27 | ||||
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 51339 -> 51339 bytes | |||
| -rw-r--r-- | docs/assets/js/application.js | 2 |
4 files changed, 15 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore index 01700de23..72b1d2772 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,4 @@ nbproject .idea # Misc -js/min - -dist
\ No newline at end of file +js/min
\ No newline at end of file @@ -9,8 +9,7 @@ WATCHR ?= `which watchr` # BUILD DOCS # -docs: dist - cp -r dist bootstrap +docs: bootstrap zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @@ -19,21 +18,21 @@ docs: dist cp img/* docs/assets/img/ # -# BUILD SIMPLE DIST DIRECTORY +# BUILD SIMPLE BOOTSTRAP DIRECTORY # lessc & uglifyjs are required # -dist: - mkdir -p dist/img - mkdir -p dist/css - mkdir -p dist/js - cp img/* dist/img/ - lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css - lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css - lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive - lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.responsive - 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 > dist/js/bootstrap.js - uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.js +bootstrap: + mkdir -p bootstrap/img + mkdir -p bootstrap/css + mkdir -p bootstrap/js + cp img/* bootstrap/img/ + lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css + lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css + lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive + lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.min.responsive + 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 > bootstrap/js/bootstrap.js + uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js # # WATCH LESS FILES diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex bd974a462..7a18bce0d 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 585700f8e..b29b63aee 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -123,7 +123,7 @@ .map(function () { return this.value }) .toArray() , vars = {} - , img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png'] + , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png'] $("#variables.download input") .each(function () { |