diff options
| author | Mark Otto <[email protected]> | 2011-06-28 15:11:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-06-28 15:11:44 -0700 |
| commit | a92aeda6a11e9d40300bad48766e0f3b5f9d9397 (patch) | |
| tree | fd65921b7596955652419d066b68451cd890f9ec | |
| parent | 4e95e558db14a2de80c6cdfd5712c15c8130a951 (diff) | |
| parent | 88e93d1cbaa6c5bfa4c19afae697e52709418a28 (diff) | |
| download | bootstrap-a92aeda6a11e9d40300bad48766e0f3b5f9d9397.tar.xz bootstrap-a92aeda6a11e9d40300bad48766e0f3b5f9d9397.zip | |
Merge branch 'master' of http://git.local.twitter.com/baseline
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | bootstrap-1.0.0.css | 2 | ||||
| -rw-r--r-- | docs/index.html | 1 | ||||
| -rw-r--r-- | lib/bootstrap.less | 2 | ||||
| -rw-r--r-- | lib/forms.less | 2 |
5 files changed, 5 insertions, 4 deletions
@@ -5,6 +5,6 @@ build: @lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css @lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress - @echo "bootstrap successfully built!" + @echo "Bootstrap successfully built! - `date`" .PHONY: build
\ No newline at end of file diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 721698cb1..8e70ac8e3 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.css @@ -597,7 +597,7 @@ pre { } /* * Forms.less - * Base line styles for various input types, form layouts, and states + * Base styles for various input types, form layouts, and states */ /* Global form styles -------------------------------------------------- */ diff --git a/docs/index.html b/docs/index.html index d1adc9a5d..d82d56b82 100644 --- a/docs/index.html +++ b/docs/index.html @@ -535,7 +535,6 @@ </section> - <section id="tables"> <div class="page-header"> <h1>Tables <small>For, you guessed it, tabular data</small></h1> diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 6fceabd24..2e021db0b 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -3,6 +3,8 @@ * This file is only for importing all required stylesheets for LESS to include and then compile. */ + + // CSS Reset @import "reset.less"; diff --git a/lib/forms.less b/lib/forms.less index a455e6832..76fd51c7a 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -1,6 +1,6 @@ /* * Forms.less - * Base line styles for various input types, form layouts, and states + * Base styles for various input types, form layouts, and states */ |