diff options
| author | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
| commit | 4876cbeef8c79686ba31c3ed22771357d71dbe51 (patch) | |
| tree | 79fed0fbb2a96fad2247c3014a045e655d1a825e /_includes | |
| parent | 1444a3ca638bd8661c0019560117ac75aace3402 (diff) | |
| parent | 561aff7942d9adfc9508232789e2598406f80934 (diff) | |
| download | bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.tar.xz bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.zip | |
Merge branch 'master' into pr/11412
Conflicts:
dist/js/bootstrap.min.js
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 18 | ||||
| -rw-r--r-- | _includes/nav-getting-started.html | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 7f9f8f103..56518ac49 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,9 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="{{ page.base_url }}dist/js/bootstrap.js"></script> -<script src="http://platform.twitter.com/widgets.js"></script> <script src="{{ page.base_url }}docs-assets/js/holder.js"></script> <script src="{{ page.base_url }}docs-assets/js/application.js"></script> @@ -18,6 +17,21 @@ <script src="{{ page.base_url }}docs-assets/js/customizer.js"></script> {% endif %} +{% comment %} + Inject Twitter widgets asynchronously. Snippet snipped from Twitter's + JS interface site: https://dev.twitter.com/docs/tfw-javascript + + * "js.async=1;" added to add async attribute to the generated script tag. +{% endcomment %} +<script> + window.twttr = (function (d,s,id) { + var t, js, fjs = d.getElementsByTagName(s)[0]; + if (d.getElementById(id)) return; js=d.createElement(s); js.id=id; js.async=1; + js.src="https://platform.twitter.com/widgets.js"; fjs.parentNode.insertBefore(js, fjs); + return window.twttr || (t = { _e: [], ready: function(f){ t._e.push(f) } }); + }(document, "script", "twitter-wjs")); +</script> + <!-- Analytics ================================================== --> <script> diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 243c05fb0..ce7a718d6 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -8,6 +8,10 @@ </li> <li> <a href="#whats-included">What's included</a> + <ul class="nav"> + <li><a href="#whats-included-precompiled">Precompiled</a></li> + <li><a href="#whats-included-source">Source code</a></li> + </ul> </li> <li> <a href="#template">Basic template</a> |