mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-01 03:10:14 +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/css/bootstrap.css
This commit is contained in:
Mark Otto
2012-01-27 21:09:24 -08:00
parent 3934d1b6c4 15d3a4797f
commit d0447e9aa5
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

15
Makefile
View File

@@ -1,4 +1,3 @@
VERSION=2.0.0
BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
@@ -12,16 +11,11 @@ WATCHR ?= `which watchr`
# #
build: build:
@@if test ! -z ${LESS_COMPRESSOR}; then \ @if test ! -z ${LESS_COMPRESSOR}; then \
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
rm -f ${BOOTSTRAP_LESS}.tmp; \
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
node docs/build; \ node docs/build; \
cp img/* docs/assets/img/; \ cp img/* docs/assets/img/; \
echo "Bootstrap successfully built! - `date`"; \
else \ else \
echo "You must have the LESS compiler installed in order to build Bootstrap."; \ echo "You must have the LESS compiler installed in order to build Bootstrap."; \
echo "You can install it by running: npm install less -g"; \ echo "You can install it by running: npm install less -g"; \
@@ -32,7 +26,7 @@ build:
# #
watch: watch:
@@if test ! -z ${WATCHR}; then \ @if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \ echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"; \ watchr -e "watch('less/.*\.less') { system 'make' }"; \
else \ else \
@@ -40,5 +34,4 @@ watch:
echo "You can install it by running: gem install watchr"; \ echo "You can install it by running: gem install watchr"; \
fi fi
.PHONY: build watch .PHONY: build watch

2
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -273,4 +273,4 @@
.offset12 { .offset(12); } .offset12 { .offset(12); }
} }
*/ */

1
docs/assets/css/bootstrap.css vendored
View File

@@ -6,7 +6,6 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 21:07:37 PST 2012
*/ */
article, article,
aside, aside,

3
less/bootstrap.less vendored
View File

@@ -1,12 +1,11 @@
/*! /*!
* Bootstrap @VERSION * Bootstrap v2.0.0
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: @DATE
*/ */
// CSS Reset // CSS Reset