aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-21 22:30:39 -0700
committerJacob Thornton <[email protected]>2011-08-21 22:30:39 -0700
commit3ef86aa7031adf7b7e50b0841ee478c6803d37b0 (patch)
tree0c2644f86cf3d727d38dc617ef51c08eb1f2e910
parent109027433dc77d58fabaa5c90dada3ee7f400b05 (diff)
downloadbootstrap-3ef86aa7031adf7b7e50b0841ee478c6803d37b0.tar.xz
bootstrap-3ef86aa7031adf7b7e50b0841ee478c6803d37b0.zip
v1.1.0
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--bootstrap-1.1.0.css (renamed from bootstrap-1.0.0.css)4
-rw-r--r--bootstrap-1.1.0.min.css (renamed from bootstrap-1.0.0.min.css)0
-rw-r--r--docs/index.html4
-rw-r--r--lib/bootstrap.less2
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index f275d7ce9..64a958f22 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 babfd5559..81ba72042 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
index d441d20b1..ff1f83c98 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
index 172300002..172300002 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.1.0.min.css
diff --git a/docs/index.html b/docs/index.html
index dd2d7416c..808d94ffc 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 ead0c8f83..6547f0397 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