Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--bootstrap-1.1.1.css (renamed from bootstrap-1.1.0.css)4
-rw-r--r--bootstrap-1.1.1.min.css (renamed from bootstrap-1.1.0.min.css)0
-rw-r--r--docs/index.html4
-rw-r--r--examples/hero.html2
-rw-r--r--lib/bootstrap.less2
7 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 64a958f22d..f4f367567f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
diff --git a/README.md b/README.md
index 81ba72042f..8ac5f78ff5 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.1.0.css">
+ <link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
For more info, refer to the docs!
diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.1.css
index 00ce6c564f..b4f38970df 100644
--- a/bootstrap-1.1.0.css
+++ b/bootstrap-1.1.1.css
@@ -1,12 +1,12 @@
/*!
- * Bootstrap v1.1.0
+ * Bootstrap v1.1.1
*
* 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: Thu Aug 25 23:30:44 PDT 2011
+ * Date: Fri Aug 26 11:11:13 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.0.min.css b/bootstrap-1.1.1.min.css
index cbedd2c6cc..cbedd2c6cc 100644
--- a/bootstrap-1.1.0.min.css
+++ b/bootstrap-1.1.1.min.css
diff --git a/docs/index.html b/docs/index.html
index 5522039254..79dcec1fa4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.1.0.css" rel="stylesheet">
+ <link href="../bootstrap-1.1.1.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.1.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.1.min.css"></textarea>
</form>
</div>
<div class="span5 columns">
diff --git a/examples/hero.html b/examples/hero.html
index faac6ab754..b86d996c99 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.1.0.css" rel="stylesheet">
+ <link href="../bootstrap-1.1.1.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 6547f03972..aa0e24b969 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v1.1.0
+ * Bootstrap v1.1.1
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0