diff --git a/Makefile b/Makefile index f4f367567f..82603c41f6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.1.1.css -BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css +BOOTSTRAP = ./bootstrap-1.2.0.css +BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` diff --git a/README.md b/README.md index 8d0e693c97..76b6e4563c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! diff --git a/bootstrap-1.1.1.css b/bootstrap-1.2.0.css similarity index 99% rename from bootstrap-1.1.1.css rename to bootstrap-1.2.0.css index 650d28a27d..afb6b584a5 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.2.0.css @@ -1,12 +1,12 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 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: Tue Aug 30 23:25:32 PDT 2011 + * Date: Tue Aug 30 23:30:34 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.2.0.min.css similarity index 100% rename from bootstrap-1.1.1.min.css rename to bootstrap-1.2.0.min.css diff --git a/docs/index.html b/docs/index.html index 415ea6a3b0..9ec827fb1d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -78,7 +78,7 @@
Hotlink the CSS

For the quickest and easiest start, just copy this snippet into your webpage.

- +
diff --git a/examples/hero.html b/examples/hero.html index a0025f2de2..ef773c5d01 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@

Project name

-
    +
    • Home
    • About
    • Contact
      • diff --git a/lib/bootstrap.less b/lib/bootstrap.less index aa0e24b969..c31bd725da 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/templates/fluid.html b/templates/fluid.html deleted file mode 100644 index 59a6ddb1c1..0000000000 --- a/templates/fluid.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -

      Project name

      - -
      -
      - -
      - - -
      - -
      -
      - -
      -

      Fluid page template

      -

      Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

      -

      Learn more »

      -
      - -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -
      - -
      - - - \ No newline at end of file