Skip to content
This repository has been archived by the owner on Apr 5, 2018. It is now read-only.

Commit

Permalink
v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Aug 22, 2011
1 parent 1090274 commit 3ef86aa
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down
4 changes: 2 additions & 2 deletions bootstrap-1.0.0.css → bootstrap-1.1.0.css
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -78,7 +78,7 @@ <h1>Bootstrap, from Twitter</h1>
<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">
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v1.0.0
* Bootstrap v1.1.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
Expand Down

0 comments on commit 3ef86aa

Please sign in to comment.