Skip to content

Commit

Permalink
move examples into docs...
Browse files Browse the repository at this point in the history
  • Loading branch information
@fat
fat committed Feb 1, 2012
1 parent bdfb05d commit fd49d4a
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 32 deletions.
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified docs/assets/bootstrap.zip
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/examples.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ <h1>Bootstrap examples</h1>

<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>
Expand Down
12 changes: 6 additions & 6 deletions examples/fluid.html → docs/examples/fluid.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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">
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -133,9 +133,9 @@ <h2>Heading</h2>
<!-- 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>
10 changes: 5 additions & 5 deletions examples/hero.html → docs/examples/hero.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -89,9 +89,9 @@ <h2>Heading</h2>
<!-- 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>
30 changes: 15 additions & 15 deletions examples/starter-template.html → docs/examples/starter-template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -60,19 +60,19 @@ <h1>Bootstrap starter template</h1>
================================================== -->
<!-- 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>
6 changes: 3 additions & 3 deletions docs/templates/pages/examples.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit fd49d4a

Please sign in to comment.