rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-01-29 16:42:37 -08:00
commit b0976bb379
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -33,6 +33,4 @@ nbproject
.idea
# Misc
js/min
dist
js/min

27
Makefile
View 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

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

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

@ -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 () {