kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse source
This commit is contained in:
Mark Otto 2012-01-29 13:25:36 -08:00
commit 391661f14b
4 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Makefile
View file

@ -6,31 +6,42 @@ LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
#
# Build less files + docs
# BUILD DOCS
#
build:
@if test ! -z ${LESS_COMPRESSOR}; then \
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
node docs/build; \
cp img/* docs/assets/img/; \
else \
echo "You must have the LESS compiler installed in order to build Bootstrap."; \
echo "You can install it by running: npm install less -g"; \
fi
docs: dist
cp -r dist bootstrap
zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
node docs/build
cp img/* docs/assets/img/
#
# Watch less files
# BUILD SIMPLE DIST 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
#
# WATCH LESS FILES
#
watch:
@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"; \
else \
echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
echo "You can install it by running: gem install watchr"; \
fi
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"
.PHONY: build watch
.PHONY: dist docs watch

BIN
docs/assets/bootstrap.zip Normal file
View file

Binary file not shown.

2
docs/index.html
View file

@ -80,7 +80,7 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a>
<a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">Download Bootstrap</a>
<a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap</a>
</p>
</div>

2
docs/templates/pages/index.mustache vendored
View file

@ -8,7 +8,7 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
<a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
<a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
</p>
</div>