mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 08:34:08 +02:00
Code Issues Releases Wiki 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
parent 702d3b6dfe 298e637d00
commit b0976bb379
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -34,5 +34,3 @@ nbproject
# Misc # Misc
js/min js/min
dist

27
Makefile
View File

@@ -9,8 +9,7 @@ WATCHR ?= `which watchr`
# BUILD DOCS # BUILD DOCS
# #
docs: dist docs: bootstrap
cp -r dist bootstrap
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}
@@ -19,21 +18,21 @@ docs: dist
cp img/* docs/assets/img/ cp img/* docs/assets/img/
# #
# BUILD SIMPLE DIST DIRECTORY # BUILD SIMPLE BOOTSTRAP DIRECTORY
# lessc & uglifyjs are required # lessc & uglifyjs are required
# #
dist: bootstrap:
mkdir -p dist/img mkdir -p bootstrap/img
mkdir -p dist/css mkdir -p bootstrap/css
mkdir -p dist/js mkdir -p bootstrap/js
cp img/* dist/img/ cp img/* bootstrap/img/
lessc ${BOOTSTRAP_LESS} > dist/css/bootstrap.css lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
lessc --compress ${BOOTSTRAP_LESS} > dist/css/bootstrap.min.css lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.responsive lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap.responsive
lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > dist/css/bootstrap.min.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 > dist/js/bootstrap.js 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 dist/js/bootstrap.js > dist/js/bootstrap.min.js uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
# #
# WATCH LESS FILES # 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 }) .map(function () { return this.value })
.toArray() .toArray()
, vars = {} , vars = {}
, img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png'] , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
$("#variables.download input") $("#variables.download input")
.each(function () { .each(function () {