diff options
| author | Jacob Thornton <[email protected]> | 2012-01-27 21:06:09 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-27 21:06:09 -0800 |
| commit | 15d3a4797f3435d1531804369df87fa4e574b874 (patch) | |
| tree | 3a92b29cc38accd64fd1c81467445201accbf438 | |
| parent | 4e191c423d2d1e834a4cb57ae246d03a82272ee4 (diff) | |
| download | bootstrap-15d3a4797f3435d1531804369df87fa4e574b874.tar.xz bootstrap-15d3a4797f3435d1531804369df87fa4e574b874.zip | |
simplify build process more - remove really annoying date.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 2 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | less/bootstrap.less | 3 |
5 files changed, 9 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore index 2da5c5c5d..01700de23 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ nbproject # Misc js/min + +dist
\ No newline at end of file @@ -1,4 +1,3 @@ -VERSION=2.0.0 BOOTSTRAP = ./docs/assets/css/bootstrap.css BOOTSTRAP_LESS = ./less/bootstrap.less BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css @@ -12,16 +11,11 @@ WATCHR ?= `which watchr` # build: - @@if test ! -z ${LESS_COMPRESSOR}; then \ - sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \ - lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \ - 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; \ + @if test ! -z ${LESS_COMPRESSOR}; then \ + lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \ + lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \ node docs/build; \ cp img/* docs/assets/img/; \ - echo "Bootstrap successfully built! - `date`"; \ 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"; \ @@ -32,7 +26,7 @@ build: # watch: - @@if test ! -z ${WATCHR}; then \ + @if test ! -z ${WATCHR}; then \ echo "Watching less files..."; \ watchr -e "watch('less/.*\.less') { system 'make' }"; \ else \ @@ -40,5 +34,4 @@ watch: echo "You can install it by running: gem install watchr"; \ fi - .PHONY: build watch
\ No newline at end of file diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 8b1d98b5c..acebb64d3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -273,4 +273,4 @@ .offset12 { .offset(12); } } -*/ +*/
\ No newline at end of file diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 861ef9141..fc0481807 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,6 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 20:16:25 PST 2012 */ article, aside, @@ -1971,7 +1970,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { diff --git a/less/bootstrap.less b/less/bootstrap.less index bc9f84373..3dad408c9 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,12 +1,11 @@ /*! - * Bootstrap @VERSION + * Bootstrap v2.0.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: @DATE */ // CSS Reset |