Skip to content

Commit fd49d4a

Browse files
fatfat
committed
move examples into docs...
1 parent bdfb05d commit fd49d4a

File tree

7 files changed

+33
-32
lines changed

7 files changed

+33
-32
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ docs: bootstrap
1818
cp img/* docs/assets/img/
1919
cp js/*.js docs/assets/js/
2020
cp js/tests/vendor/jquery.js docs/assets/js/
21+
cp js/tests/vendor/jquery.js docs/assets/js/
2122

2223
#
2324
# BUILD SIMPLE BOOTSTRAP DIRECTORY

‎docs/assets/bootstrap.zip

0 Bytes
Binary file not shown.

‎docs/examples.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ <h1>Bootstrap examples</h1>
8484

8585
<ul class="thumbnails bootstrap-examples">
8686
<li class="span4">
87-
<a class="thumbnail" href="../examples/hero.html">
87+
<a class="thumbnail" href="examples/hero.html">
8888
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
8989
</a>
9090
<h3>Basic marketing site</h3>
9191
<p>Featuring a hero unit for a primary message and three supporting elements.</p>
9292
</li>
9393
<li class="span4">
94-
<a class="thumbnail" href="../examples/fluid.html">
94+
<a class="thumbnail" href="examples/fluid.html">
9595
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
9696
</a>
9797
<h3>Fluid layout</h3>
9898
<p>Uses are new responsive, fluid grid system to create seamless liquid layout.</p>
9999
</li>
100100
<li class="span4">
101-
<a class="thumbnail" href="../examples/starter-template.html">
101+
<a class="thumbnail" href="examples/starter-template.html">
102102
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
103103
</a>
104104
<h3>Starter template</h3>

‎examples/fluid.html renamed to ‎docs/examples/fluid.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
15+
<link href="../assets/css/bootstrap.css" rel="stylesheet">
1616
<style type="text/css">
1717
body {
1818
padding-top: 60px;
@@ -22,7 +22,7 @@
2222
padding: 9px 0;
2323
}
2424
</style>
25-
<link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
25+
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
2626

2727
<!-- Le fav and touch icons -->
2828
<link rel="shortcut icon" href="images/favicon.ico">
@@ -76,7 +76,7 @@
7676
<li><a href="#">Link</a></li>
7777
<li><a href="#">Link</a></li>
7878
</ul>
79-
</div><!--/.well -->
79+
</div><!--/.well -->
8080
</div><!--/span-->
8181
<div class="span9">
8282
<div class="hero-unit">
@@ -133,9 +133,9 @@ <h2>Heading</h2>
133133
<!-- Le javascript
134134
================================================== -->
135135
<!-- Placed at the end of the document so the pages load faster -->
136-
<script src="../js/tests/vendor/jquery.js"></script>
137-
<script src="../js/bootstrap-transition.js"></script>
138-
<script src="../js/bootstrap-collapse.js"></script>
136+
<script src="../assets/js/tests/vendor/jquery.js"></script>
137+
<script src="../assets/js/bootstrap-transition.js"></script>
138+
<script src="../assets/js/bootstrap-collapse.js"></script>
139139

140140
</body>
141141
</html>

‎examples/hero.html renamed to ‎docs/examples/hero.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
15+
<link href="../assets/css/bootstrap.css" rel="stylesheet">
1616
<style type="text/css">
1717
body {
1818
padding-top: 60px;
1919
padding-bottom: 40px;
2020
}
2121
</style>
22-
<link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
22+
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
2323

2424
<!-- Le fav and touch icons -->
2525
<link rel="shortcut icon" href="images/favicon.ico">
@@ -89,9 +89,9 @@ <h2>Heading</h2>
8989
<!-- Le javascript
9090
================================================== -->
9191
<!-- Placed at the end of the document so the pages load faster -->
92-
<script src="../js/tests/vendor/jquery.js"></script>
93-
<script src="../js/bootstrap-transition.js"></script>
94-
<script src="../js/bootstrap-collapse.js"></script>
92+
<script src="../assets/js/tests/vendor/jquery.js"></script>
93+
<script src="../assets/js/bootstrap-transition.js"></script>
94+
<script src="../assets/js/bootstrap-collapse.js"></script>
9595

9696
</body>
9797
</html>

‎examples/starter-template.html renamed to ‎docs/examples/starter-template.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<![endif]-->
1313

1414
<!-- Le styles -->
15-
<link href="../docs/assets/css/bootstrap.css" rel="stylesheet">
16-
<link href="../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
15+
<link href="../assets/css/bootstrap.css" rel="stylesheet">
16+
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
1717
<style>
1818
body {
1919
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
@@ -60,19 +60,19 @@ <h1>Bootstrap starter template</h1>
6060
================================================== -->
6161
<!-- Placed at the end of the document so the pages load faster -->
6262
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
63-
<script src="../js/tests/vendor/jquery.js"></script>
64-
<script src="../js/bootstrap-transition.js"></script>
65-
<script src="../js/bootstrap-alert.js"></script>
66-
<script src="../js/bootstrap-modal.js"></script>
67-
<script src="../js/bootstrap-dropdown.js"></script>
68-
<script src="../js/bootstrap-scrollspy.js"></script>
69-
<script src="../js/bootstrap-tab.js"></script>
70-
<script src="../js/bootstrap-tooltip.js"></script>
71-
<script src="../js/bootstrap-popover.js"></script>
72-
<script src="../js/bootstrap-button.js"></script>
73-
<script src="../js/bootstrap-collapse.js"></script>
74-
<script src="../js/bootstrap-carousel.js"></script>
75-
<script src="../js/bootstrap-typeahead.js"></script>
63+
<script src="../assets/js/tests/vendor/jquery.js"></script>
64+
<script src="../assets/js/bootstrap-transition.js"></script>
65+
<script src="../assets/js/bootstrap-alert.js"></script>
66+
<script src="../assets/js/bootstrap-modal.js"></script>
67+
<script src="../assets/js/bootstrap-dropdown.js"></script>
68+
<script src="../assets/js/bootstrap-scrollspy.js"></script>
69+
<script src="../assets/js/bootstrap-tab.js"></script>
70+
<script src="../assets/js/bootstrap-tooltip.js"></script>
71+
<script src="../assets/js/bootstrap-popover.js"></script>
72+
<script src="../assets/js/bootstrap-button.js"></script>
73+
<script src="../assets/js/bootstrap-collapse.js"></script>
74+
<script src="../assets/js/bootstrap-carousel.js"></script>
75+
<script src="../assets/js/bootstrap-typeahead.js"></script>
7676

7777
</body>
7878
</html>

‎docs/templates/pages/examples.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88

99
<ul class="thumbnails bootstrap-examples">
1010
<li class="span4">
11-
<a class="thumbnail" href="../examples/hero.html">
11+
<a class="thumbnail" href="examples/hero.html">
1212
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
1313
</a>
1414
<h3>{{_i}}Basic marketing site{{/i}}</h3>
1515
<p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
1616
</li>
1717
<li class="span4">
18-
<a class="thumbnail" href="../examples/fluid.html">
18+
<a class="thumbnail" href="examples/fluid.html">
1919
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
2020
</a>
2121
<h3>{{_i}}Fluid layout{{/i}}</h3>
2222
<p>{{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
2323
</li>
2424
<li class="span4">
25-
<a class="thumbnail" href="../examples/starter-template.html">
25+
<a class="thumbnail" href="examples/starter-template.html">
2626
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
2727
</a>
2828
<h3>{{_i}}Starter template{{/i}}</h3>

0 commit comments

Comments
 (0)