From fd49d4a44f7fe73054b861461b9ec0f36a1bb29a Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 31 Jan 2012 17:35:23 -0800
Subject: [PATCH] move examples into docs...
---
Makefile | 1 +
docs/assets/bootstrap.zip | Bin 52330 -> 52330 bytes
docs/examples.html | 6 ++--
{examples => docs/examples}/fluid.html | 12 +++----
{examples => docs/examples}/hero.html | 10 +++---
.../examples}/starter-template.html | 30 +++++++++---------
docs/templates/pages/examples.mustache | 6 ++--
7 files changed, 33 insertions(+), 32 deletions(-)
rename {examples => docs/examples}/fluid.html (94%)
rename {examples => docs/examples}/hero.html (91%)
rename {examples => docs/examples}/starter-template.html (69%)
diff --git a/Makefile b/Makefile
index 5995bc519a..5492b8e112 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ docs: bootstrap
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
+ cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index bcc701d3a9b4989ce7c9e507d5217634a6c1a15f..c89b1ef663aebe4d73fce9ba4f795df4140c9b82 100644
GIT binary patch
delta 455
zcmaDggZb4AW}X0VW)?065J>5n$fL-1W}1fo*=ds-PYZJ)Nd%}ONlfhHU;-+hVFVUC
zGi~FA5CfpVWHm!GsL19d!<D)qA>Mdfm{34`AUjBCahfGe=uz4!ut@<j{F%Aw`k^75
z49p1oA=XU(mhTKxZ(mR;05W1%1KiZV4b@<ws);IKRS>5`wH};k0Mq(?;%fz_)Sk&t
zHkq)U1$yz!w9Rsx_lkf_yL()p=?uun;vBGmn5=uk7$PPMQqg$A0g3nMgbNbS{iHV%
zZ}Ula2oJ?9naSp-#F13xp9)0cJv;?90ZEVVX(J>R3r^d?ct9`wKkdW>@#f^PGa>-t
Cjk>@9
delta 455
zcmaDggZb4AW}X0VW)?065QyrY$fL-1XNrdZ-6@kBPYZJ)Nd%}ONlfhHU;-+hVFVVt
zGiBq25CfpVWHm!GsL19d!<D)qA>Mdfm{34`AUjBCahfGe=uz4!ut@<j{F%Aw`k^75
z49p1oA=XU(mhTKxZ(mR;05W1%1KiZV4b@<ws);IKRS>5`wH};k0Mq(?;%fzv)+d`x
zU_x@6_lkgo?jF}?x&!jDI0q~sChMLshKR|6R5YG&K;k_*;ey0-Kk1Fc+kDa;!b34j
rX0rJyaU@mwrvj094^Kf&K+@xT+6YO-g41?Ly#J@2AUxs8VP`}D;1av6
diff --git a/docs/examples.html b/docs/examples.html
index 6f35b71694..d317405aea 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -84,21 +84,21 @@
<ul class="thumbnails bootstrap-examples">
<li class="span4">
- <a class="thumbnail" href="../examples/hero.html">
+ <a class="thumbnail" href="examples/hero.html">
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
</a>
<h3>Basic marketing site</h3>
<p>Featuring a hero unit for a primary message and three supporting elements.</p>
</li>
<li class="span4">
- <a class="thumbnail" href="../examples/fluid.html">
+ <a class="thumbnail" href="examples/fluid.html">
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
</a>
<h3>Fluid layout</h3>
<p>Uses are new responsive, fluid grid system to create seamless liquid layout.</p>
</li>
<li class="span4">
- <a class="thumbnail" href="../examples/starter-template.html">
+ <a class="thumbnail" href="examples/starter-template.html">
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
</a>
<h3>Starter template</h3>
diff --git a/examples/fluid.html b/docs/examples/fluid.html
similarity index 94%
rename from examples/fluid.html
rename to docs/examples/fluid.html
index b38ff98708..5249f2b4d2 100644
--- a/examples/fluid.html
+++ b/docs/examples/fluid.html
@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
- <link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
@@ -22,7 +22,7 @@
padding: 9px 0;
}
</style>
- <link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
@@ -76,7 +76,7 @@
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
- </div><!--/.well -->
+ </div><!--/.well -->
</div><!--/span-->
<div class="span9">
<div class="hero-unit">
@@ -133,9 +133,9 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="../js/tests/vendor/jquery.js"></script>
- <script src="../js/bootstrap-transition.js"></script>
- <script src="../js/bootstrap-collapse.js"></script>
+ <script src="../assets/js/tests/vendor/jquery.js"></script>
+ <script src="../assets/js/bootstrap-transition.js"></script>
+ <script src="../assets/js/bootstrap-collapse.js"></script>
</body>
</html>
diff --git a/examples/hero.html b/docs/examples/hero.html
similarity index 91%
rename from examples/hero.html
rename to docs/examples/hero.html
index f6d97481c9..2896aa79d0 100644
--- a/examples/hero.html
+++ b/docs/examples/hero.html
@@ -12,14 +12,14 @@
<![endif]-->
<!-- Le styles -->
- <link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
padding-bottom: 40px;
}
</style>
- <link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
@@ -89,9 +89,9 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="../js/tests/vendor/jquery.js"></script>
- <script src="../js/bootstrap-transition.js"></script>
- <script src="../js/bootstrap-collapse.js"></script>
+ <script src="../assets/js/tests/vendor/jquery.js"></script>
+ <script src="../assets/js/bootstrap-transition.js"></script>
+ <script src="../assets/js/bootstrap-collapse.js"></script>
</body>
</html>
diff --git a/examples/starter-template.html b/docs/examples/starter-template.html
similarity index 69%
rename from examples/starter-template.html
rename to docs/examples/starter-template.html
index 99450aa035..5370f2983e 100644
--- a/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -12,8 +12,8 @@
<![endif]-->
<!-- Le styles -->
- <link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
- <link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap.css" rel="stylesheet">
+ <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
@@ -60,19 +60,19 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
- <script src="../js/tests/vendor/jquery.js"></script>
- <script src="../js/bootstrap-transition.js"></script>
- <script src="../js/bootstrap-alert.js"></script>
- <script src="../js/bootstrap-modal.js"></script>
- <script src="../js/bootstrap-dropdown.js"></script>
- <script src="../js/bootstrap-scrollspy.js"></script>
- <script src="../js/bootstrap-tab.js"></script>
- <script src="../js/bootstrap-tooltip.js"></script>
- <script src="../js/bootstrap-popover.js"></script>
- <script src="../js/bootstrap-button.js"></script>
- <script src="../js/bootstrap-collapse.js"></script>
- <script src="../js/bootstrap-carousel.js"></script>
- <script src="../js/bootstrap-typeahead.js"></script>
+ <script src="../assets/js/tests/vendor/jquery.js"></script>
+ <script src="../assets/js/bootstrap-transition.js"></script>
+ <script src="../assets/js/bootstrap-alert.js"></script>
+ <script src="../assets/js/bootstrap-modal.js"></script>
+ <script src="../assets/js/bootstrap-dropdown.js"></script>
+ <script src="../assets/js/bootstrap-scrollspy.js"></script>
+ <script src="../assets/js/bootstrap-tab.js"></script>
+ <script src="../assets/js/bootstrap-tooltip.js"></script>
+ <script src="../assets/js/bootstrap-popover.js"></script>
+ <script src="../assets/js/bootstrap-button.js"></script>
+ <script src="../assets/js/bootstrap-collapse.js"></script>
+ <script src="../assets/js/bootstrap-carousel.js"></script>
+ <script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
diff --git a/docs/templates/pages/examples.mustache b/docs/templates/pages/examples.mustache
index 22d78b982b..8ae07f412d 100644
--- a/docs/templates/pages/examples.mustache
+++ b/docs/templates/pages/examples.mustache
@@ -8,21 +8,21 @@
<ul class="thumbnails bootstrap-examples">
<li class="span4">
- <a class="thumbnail" href="../examples/hero.html">
+ <a class="thumbnail" href="examples/hero.html">
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
</a>
<h3>{{_i}}Basic marketing site{{/i}}</h3>
<p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
</li>
<li class="span4">
- <a class="thumbnail" href="../examples/fluid.html">
+ <a class="thumbnail" href="examples/fluid.html">
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
</a>
<h3>{{_i}}Fluid layout{{/i}}</h3>
<p>{{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
</li>
<li class="span4">
- <a class="thumbnail" href="../examples/starter-template.html">
+ <a class="thumbnail" href="examples/starter-template.html">
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
</a>
<h3>{{_i}}Starter template{{/i}}</h3>
--
GitLab