From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 22 Aug 2011 05:30:39 +0000 (-0700)
Subject: v1.1.0
X-Git-Tag: v1.1.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ef86aa7031adf7b7e50b0841ee478c6803d37b0;p=thirdparty%2Fbootstrap.git

v1.1.0
---

diff --git a/Makefile b/Makefile
index f275d7ce96..64a958f22d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.0.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.0.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.0.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`
diff --git a/README.md b/README.md
index babfd55591..81ba72042f 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:
 
-    <link rel="stylesheet" type="text/css" href="bootstrap-1.0.0.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.1.0.css">
 
 For more info, refer to the docs!
 
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.1.0.css
similarity index 99%
rename from bootstrap-1.0.0.css
rename to bootstrap-1.1.0.css
index d441d20b19..ff1f83c982 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.1.0.css
@@ -1,12 +1,12 @@
 /*!
- * Bootstrap v1.0.0
+ * Bootstrap v1.1.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: Sun Aug 21 22:26:51 PDT 2011
+ * Date: Sun Aug 21 22:29:48 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.0.0.min.css b/bootstrap-1.1.0.min.css
similarity index 100%
rename from bootstrap-1.0.0.min.css
rename to bootstrap-1.1.0.min.css
diff --git a/docs/index.html b/docs/index.html
index dd2d7416c4..808d94ffcb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.0.0.css" rel="stylesheet">
+    <link href="../bootstrap-1.1.0.css" rel="stylesheet">
     <link href="assets/css/docs.css" rel="stylesheet">
     <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
 
@@ -78,7 +78,7 @@
             <h6>Hotlink the CSS</h6>
             <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
             <form>
-              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.0.0.min.css"></textarea>
+              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.0.min.css"></textarea>
             </form>
           </div>
           <div class="span5 columns">
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index ead0c8f832..6547f03972 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v1.0.0
+ * Bootstrap v1.1.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0