simplify build process more - remove really annoying date.

diff --git a/.gitignore b/.gitignore
index 2da5c5c5d2af040c6cb504d85206ba790701eb96..01700de23525219f9066a33e4d02e6b85789df9f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ nbproject
 
 # Misc
 js/min
+
+dist
\ No newline at end of file

diff --git a/Makefile b/Makefile
index f2213103aa8c421476d332d2dccc890f47a1e965..879d594409a5e9287c9e4d89fcf0896aad4bd770 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 8b1d98b5c67d9985dc387eba6ed01352d51b96fc..acebb64d3b00e926b5b4cc24006df54184c26c36 100644 (file)
--- 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 861ef91414c22505bed93754f71b7e97d046b2d9..fc0481807de970e0547876c3597ac0f5e27cf08a 100644 (file)
--- 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 bc9f84373c1f02dfeabcdb8f44e36837c6596a7e..3dad408c96e8c235921cc299b1213c24bbd62cce 100644 (file)
--- 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