aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-17 22:44:26 -0700
committerMark Otto <[email protected]>2012-07-17 22:44:26 -0700
commitba90d0fc5ea440a49fdf611d95ecfe4d99e8f779 (patch)
treee991cc804d8a740f35015d14137e2f0bc7678554
parent326b665065d8a1901cf53c145b98cbbdbdae6057 (diff)
parenta8316c780d3f2422b95a537750ce061b2973316d (diff)
downloadbootstrap-ba90d0fc5ea440a49fdf611d95ecfe4d99e8f779.tar.xz
bootstrap-ba90d0fc5ea440a49fdf611d95ecfe4d99e8f779.zip
Merge pull request #4110 from purwandi/develop
Moved JS to bottom on extends page
-rw-r--r--docs/extend.html9
-rw-r--r--docs/templates/pages/extend.mustache9
2 files changed, 12 insertions, 6 deletions
diff --git a/docs/extend.html b/docs/extend.html
index ee7de7a8c..43bccc8c0 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -203,10 +203,11 @@
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt;
&lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/body&gt;
&lt;/html&gt;
</pre>
@@ -219,13 +220,15 @@
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt;
&lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;!-- Project --&gt;
&lt;link href="public/css/application.css" rel="stylesheet"&gt;
- &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
+ &lt;!-- Project --&gt;
+ &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
&lt;/body&gt;
&lt;/html&gt;
</pre>
diff --git a/docs/templates/pages/extend.mustache b/docs/templates/pages/extend.mustache
index 508bd7e15..e32833b0e 100644
--- a/docs/templates/pages/extend.mustache
+++ b/docs/templates/pages/extend.mustache
@@ -132,10 +132,11 @@
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt;
&lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;/body&gt;
&lt;/html&gt;
</pre>
@@ -148,13 +149,15 @@
&lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
&lt;!-- Bootstrap --&gt;
&lt;link href="public/css/bootstrap.min.css" rel="stylesheet"&gt;
- &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
&lt;!-- Project --&gt;
&lt;link href="public/css/application.css" rel="stylesheet"&gt;
- &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;h1&gt;Hello, world!&lt;/h1&gt;
+ &lt;!-- Bootstrap --&gt;
+ &lt;script src="public/js/bootstrap.min.js"&gt;&lt;/script&gt;
+ &lt;!-- Project --&gt;
+ &lt;script src="public/js/application.js"&gt;&lt;/script&gt;
&lt;/body&gt;
&lt;/html&gt;
</pre>