Skip to content

Commit 4fb1c5b

Browse files
committedAug 31, 2011
rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html
1 parent 588cb1c commit 4fb1c5b

File tree

8 files changed

+10
-91
lines changed

8 files changed

+10
-91
lines changed
 

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DATE=$(shell DATE)
2-
BOOTSTRAP = ./bootstrap-1.1.1.css
3-
BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
2+
BOOTSTRAP = ./bootstrap-1.2.0.css
3+
BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
44
BOOTSTRAP_LESS = ./lib/bootstrap.less
55
LESS_COMPESSOR ?= `which lessc`
66
WATCHR ?= `which watchr`

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
1818

1919
Or if you prefer, the standard css way:
2020

21-
<link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
21+
<link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
2222

2323
For more info, refer to the docs!
2424

‎bootstrap-1.1.1.css ‎bootstrap-1.2.0.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* Bootstrap v1.1.1
2+
* Bootstrap v1.2.0
33
*
44
* Copyright 2011 Twitter, Inc
55
* Licensed under the Apache License v2.0
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Tue Aug 30 23:25:32 PDT 2011
9+
* Date: Tue Aug 30 23:30:34 PDT 2011
1010
*/
1111
/* Reset.less
1212
* 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).
File renamed without changes.

‎docs/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
15+
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
1616
<link href="assets/css/docs.css" rel="stylesheet">
1717
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
1818

@@ -78,7 +78,7 @@ <h1>Bootstrap, from Twitter</h1>
7878
<h6>Hotlink the CSS</h6>
7979
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
8080
<form>
81-
<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>
81+
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
8282
</form>
8383
</div>
8484
<div class="span5 columns">

‎examples/hero.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
15+
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
1616

1717
<!-- Le fav and touch icons -->
1818
<link rel="shortcut icon" href="images/favicon.ico">
@@ -27,7 +27,7 @@
2727
<div class="fill">
2828
<div class="container">
2929
<h3><a href="#">Project name</a></h3>
30-
<ul>
30+
<ul class="nav">
3131
<li class="active"><a href="#">Home</a></li>
3232
<li><a href="#about">About</a></li>
3333
<li><a href="#contact">Contact</a></li>

‎lib/bootstrap.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v1.1.1
2+
* Bootstrap v1.2.0
33
*
44
* Copyright 2011 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎templates/fluid.html

-81
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.