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 diff --git a/Makefile b/Makefile index fed5ffca4..8811d03e1 100644 --- a/Makefile +++ b/Makefile @@ -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 index bd974a462..7a18bce0d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 () {