diff --git a/Makefile b/Makefile index 5995bc519a8016169b9b385a0769da42168eeaf5..5492b8e112a575453bd2ad209cecafb0085afefa 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 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/examples.html b/docs/examples.html index 6f35b71694d2be12d9dbfd954465f5e03748b1ff..d317405aeae4cc9d9c1498e61f32f4fddc47964f 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 b38ff98708f645871c0b4a2cfed7c8dfe23f4080..5249f2b4d2a11b8aad51bd168aafc4cdeb31e879 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 f6d97481c925e65d94bb6f0f898e0d15cd708e15..2896aa79d0ba785c7a661c79c8108548b67e0951 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 99450aa035b7aa0b2a7f7fa9598ec87b78a0350a..5370f2983e8a93a90d11d2c0546e1e83db6ce0a4 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 22d78b982b8bb8b0e6eee88c2c7fedfeef78e715..8ae07f412d48ea3c2bb2dfe8416ee2645e7ea279 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>