aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-12-22 19:25:29 -0800
committerJacob Thornton <[email protected]>2011-12-22 19:25:29 -0800
commit49fb910b11baef4ccfe9270479e8b9bf9e5e7731 (patch)
tree8e86dc3e56ec551800ac051ae1f8cc345b36dda2 /docs
parent3396fc0542a5fbbed658a95f931472fc24feee56 (diff)
downloadbootstrap-49fb910b11baef4ccfe9270479e8b9bf9e5e7731.tar.xz
bootstrap-49fb910b11baef4ccfe9270479e8b9bf9e5e7731.zip
more js cleanup after gnarly merge
Diffstat (limited to 'docs')
-rw-r--r--docs/base-css.html1
-rw-r--r--docs/components.html28
-rw-r--r--docs/scaffolding.html1
3 files changed, 13 insertions, 17 deletions
diff --git a/docs/base-css.html b/docs/base-css.html
index 34e844df3..dad42381d 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1180,7 +1180,6 @@ Form states
<!-- Placed at the end of the document so the pages load faster -->
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
- <script>$(function () { prettyPrint() })</script>
<script src="assets/js/application.js"></script>
</body>
</html>
diff --git a/docs/components.html b/docs/components.html
index 26a657cb5..5b4e788f1 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -22,18 +22,6 @@
<link rel="apple-touch-icon" href="assets/ico/bootstrap-apple-57x57.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/bootstrap-apple-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/bootstrap-apple-114x114.png">
-
- <!-- Le javascript -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
- <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
- <script src="assets/js/google-code-prettify/prettify.js"></script>
- <script>$(function () { prettyPrint() })</script>
- <script src="../js/bootstrap-transitions.js"></script>
- <script src="../js/bootstrap-dropdown.js"></script>
- <script src="../js/bootstrap-twipsy.js"></script>
- <script src="../js/bootstrap-scrollspy.js"></script>
- <script src="assets/js/application.js"></script>
</head>
<body>
@@ -768,7 +756,7 @@
<div class="twipsies well">
<div style="position: relative">
<p class="muted" style="margin-bottom: 0">
-Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. <a href="#" title="right">Voluptasdicta</a> eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt <a href="#" title="left">sed</a> dicta quae accusantium fugit voluptas nemo voluptas voluptatem <a href="#" title="above">rem</a> quae aut veritatis quasi quae.
+Lorem ipsum dolar sit amet illo error <a href="#" title="bottom">ipsum</a> veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. <a href="#" title="right">Voluptasdicta</a> eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt <a href="#" title="left">sed</a> dicta quae accusantium fugit voluptas nemo voluptas voluptatem <a href="#" title="top">rem</a> quae aut veritatis quasi quae.
</p>
</div>
</div>
@@ -811,9 +799,6 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div><!-- /row -->
</section>
-
-
-
<!-- Footer
================================================== -->
<footer class="footer">
@@ -823,5 +808,16 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer>
</div><!-- /container -->
+
+ <!-- Le javascript -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
+ <script src="assets/js/google-code-prettify/prettify.js"></script>
+ <script src="../js/bootstrap-transition.js"></script>
+ <script src="../js/bootstrap-dropdown.js"></script>
+ <script src="../js/bootstrap-tab.js"></script>
+ <script src="../js/bootstrap-scrollspy.js"></script>
+ <script src="../js/bootstrap-twipsy.js"></script>
+ <script src="assets/js/application.js"></script>
</body>
</html>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index dc35bd577..0a46252dd 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -375,5 +375,6 @@
<script src="../js/bootstrap-transition.js"></script>
<script src="../js/bootstrap-twipsy.js"></script>
<script src="assets/js/application.js"></script>
+
</body>
</html>