Skip to content

B
bootstrap
Commit 076370f3 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

fix for linux

parent 04fee211
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
Makefile
View file @ 076370f3
VERSION=2.0.0 VERSION=2.0.0
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap.css BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less BOOTSTRAP_LESS = ./lib/bootstrap.less
...@@ -9,7 +8,7 @@ WATCHR ?= `which watchr` ...@@ -9,7 +8,7 @@ WATCHR ?= `which watchr`
build: build:
@@if test ! -z ${LESS_COMPESSOR}; then \ @@if test ! -z ${LESS_COMPESSOR}; then \
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \ lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
rm -f ${BOOTSTRAP_LESS}.tmp; \ rm -f ${BOOTSTRAP_LESS}.tmp; \
......
bootstrap.css
View file @ 076370f3
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
* 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.
<<<<<<< HEAD * Date: Sat Dec 24 22:30:43 PST 2011
* Date: Thu Dec 22 19:09:49 PST 2011
=======
* Date: Wed Dec 21 18:38:56 CST 2011
>>>>>>> 9fb380151d477f1741b7609ade7a9e7fd5450b2c
*/ */
html, body { html, body {
margin: 0; margin: 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment