rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html

diff --git a/Makefile b/Makefile
index f4f367567facc11e627d1645374ead5aef66b2e8..82603c41f6298a223dbfe971f8c868a55ec917e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.1.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
+BOOTSTRAP = ./bootstrap-1.2.0.css
+BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`

diff --git a/README.md b/README.md
index 8d0e693c978dc510a0fe8cba6d0ec6643162dfd2..76b6e4563c2f654245b3bf793e4be2bd09829f37 100644 (file)
--- 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.1.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
 
 For more info, refer to the docs!
 

diff --git a/bootstrap-1.1.1.css b/bootstrap-1.2.0.css
similarity index 99%
rename from bootstrap-1.1.1.css
rename to bootstrap-1.2.0.css
index 650d28a27d2d4361e7d8485833385de2daf45497..afb6b584a504fb6eaaf15626ff3aa551cf2051b0 100644 (file)
--- a/bootstrap-1.1.1.css
+++ b/bootstrap-1.2.0.css
@@ -1,12 +1,12 @@
 /*!
- * Bootstrap v1.1.1
+ * Bootstrap v1.2.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: Tue Aug 30 23:25:32 PDT 2011
+ * Date: Tue Aug 30 23:30:34 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.1.min.css b/bootstrap-1.2.0.min.css
similarity index 100%
rename from bootstrap-1.1.1.min.css
rename to bootstrap-1.2.0.min.css

diff --git a/docs/index.html b/docs/index.html
index 415ea6a3b00d2d38355aa8cc1bcce561e8acefcb..9ec827fb1db64f812a886ccabd4668b8ab4c7e7b 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
+    <link href="../bootstrap-1.2.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.1.1.min.css"></textarea>
+              <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>
             </form>
           </div>
           <div class="span5 columns">

diff --git a/examples/hero.html b/examples/hero.html
index a0025f2de2158819ee58e0bd8eb28550d7455f07..ef773c5d0175fa42d96c073a60c42e025a27c77f 100644 (file)
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
     <![endif]-->
 
     <!-- Le styles -->
-    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
+    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
 
     <!-- Le fav and touch icons -->
     <link rel="shortcut icon" href="images/favicon.ico">
@@ -27,7 +27,7 @@
       <div class="fill">
         <div class="container">
           <h3><a href="#">Project name</a></h3>
-          <ul>
+          <ul class="nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>

diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index aa0e24b969b10d81370e0212e0aea9fc4b8f56fa..c31bd725da330581341d7109ba035bf0419c33eb 100644 (file)
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v1.1.1
+ * Bootstrap v1.2.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0

diff --git a/templates/fluid.html b/templates/fluid.html
deleted file mode 100644 (file)
index 59a6ddb..0000000
--- a/templates/fluid.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-    <!-- Le styles -->
-    <link href="../bootstrap-1.0.0.css" rel="stylesheet">
-    <link href="assets/css/docs.css" rel="stylesheet">
-
-    <!-- Le javascript -->
-    <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
-    <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
-    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
-    <script src="assets/js/google-code-prettify/prettify.js"></script>
-    <script src="assets/js/application.js"></script>
-
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-  </head>
-
-  <body>
-
-    <div class="topbar">
-      <div class="container-fluid">
-        <h3><a href="#">Project name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#grid-system">About</a></li>
-          <li><a href="#layouts">Contact</a></li>
-        </ul>
-      </div>
-    </div>
-
-    <div class="container-fluid">
-
-      <!-- Sidebar for navigation and secondary content -->
-      <div class="sidebar">
-        <nav class="well">
-          <ul>
-            <li><a href="#">Home</a></li>
-            <li><a href="#">About</a></li>
-            <li><a href="#">Contact</a></li>
-          </ul>
-        </nav>
-      </div> <!-- /sidebar -->
-      <div class="content">
-        <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="hero-unit">
-          <h1>Fluid page template</h1>
-          <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
-          <p><a class="btn btn-large">Learn more &raquo;</a></p>
-        </div>
-        <!-- Example row of columns -->
-        <div class="row">
-          <div class="span6">
-            <h2>Heading</h2>
-          </div>
-          <div class="span5">
-            <h2>Heading</h2>
-          </div>
-          <div class="span5">
-            <h2>Heading</h2>
-          </div>
-        </div>
-      </div> <!-- /content -->
-
-    </div> <!-- /container -->
-
-  </body>
-</html>
\ No newline at end of file