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:
authorJacob Thornton <jacobthornton@gmail.com>2011-09-16 10:09:56 +0400
committerJacob Thornton <jacobthornton@gmail.com>2011-09-16 10:09:56 +0400
commit472632ba51a50457370c55267a736e3efc4c09cc (patch)
tree62a4dd11a12502ee3feb8f1e6668aae450345eb0
parent5675d8f00a16d1f5c3eebbe7e9a0ec2b0f494855 (diff)
mv 1.3.0 file names to plane bootstrap.css for submodulers
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--bootstrap.css (renamed from bootstrap-1.3.0.css)2
-rw-r--r--bootstrap.min.css (renamed from bootstrap-1.3.0.min.css)0
-rw-r--r--docs/index.html8
-rw-r--r--docs/javascript.html2
-rw-r--r--examples/container-app.html2
-rw-r--r--examples/fluid.html2
-rw-r--r--examples/hero.html2
9 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 5ae8740b0e..ca99eaa185 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.3.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css
+BOOTSTRAP = ./bootstrap.css
+BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
diff --git a/README.md b/README.md
index d9a7cb20ad..98953a7ad9 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.3.0.css">
+ <link rel="stylesheet" type="text/css" href="bootstrap.css">
For more info, refer to the docs!
diff --git a/bootstrap-1.3.0.css b/bootstrap.css
index 5ee7493b35..a7adebc693 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* 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 Sep 15 22:40:45 PDT 2011
+ * Date: Thu Sep 15 23:09:33 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.3.0.min.css b/bootstrap.min.css
index 76ca63f54f..76ca63f54f 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap.min.css
diff --git a/docs/index.html b/docs/index.html
index 20e27f9b42..2edd852ba9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+ <link href="../bootstrap.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -84,7 +84,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.3.0.min.css"></textarea>
+ <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
</form>
</div>
<div class="span5">
@@ -143,7 +143,7 @@
<ul>
<li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
<li>All original .less files</li>
- <li>Fully <a href="../bootstrap-1.3.0.css">compiled</a> and <a href="../bootstrap-1.3.0.min.css">minified</a> CSS</li>
+ <li>Fully <a href="../bootstrap.css">compiled</a> and <a href="../bootstrap.min.css">minified</a> CSS</li>
<li>Complete styleguide documentation</li>
<li>Three example pages with different layouts</li>
</ul>
@@ -1884,7 +1884,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<td>Command line</td>
<td>
<p>If you already have the less command line tool installed, simply run the following command:</p>
- <pre>$ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css</pre>
+ <pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
<p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
</td>
</tr>
diff --git a/docs/javascript.html b/docs/javascript.html
index e1c4e83dc3..454251c2b2 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -24,7 +24,7 @@
<script src="../js/bootstrap-tabs.js"></script>
<!-- Le styles -->
- <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+ <link href="../bootstrap.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
diff --git a/examples/container-app.html b/examples/container-app.html
index 20ab137899..6432ecf0d8 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+ <link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
/* Override some defaults */
html, body {
diff --git a/examples/fluid.html b/examples/fluid.html
index f613b0ebb3..07012e5e9c 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+ <link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
diff --git a/examples/hero.html b/examples/hero.html
index a2e5e53e4d..fab3d688b1 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+ <link href="../bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;