diff options
| author | lucascono <[email protected]> | 2017-10-04 05:33:17 -0300 |
|---|---|---|
| committer | lucascono <[email protected]> | 2017-10-04 05:33:17 -0300 |
| commit | 8c04a74c8c7f0174ea08bc02fa3762f49bf615a3 (patch) | |
| tree | db9d6923c082243d765c57885992db8dd26a70b5 /_includes/scripts.html | |
| parent | 9aff890efa3798f831b714c41794c9fee0684bae (diff) | |
| parent | b29b1e155880ac953899889c9cbb67f7f7df0529 (diff) | |
| download | bootstrap-8c04a74c8c7f0174ea08bc02fa3762f49bf615a3.tar.xz bootstrap-8c04a74c8c7f0174ea08bc02fa3762f49bf615a3.zip | |
Merge remote-tracking branch 'refs/remotes/twbs/v4-dev' into v4-dev
Diffstat (limited to '_includes/scripts.html')
| -rw-r--r-- | _includes/scripts.html | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/_includes/scripts.html b/_includes/scripts.html index da73fdd68..0af5f5c69 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -16,16 +16,15 @@ <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script> <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script> <script src="{{ site.baseurl }}/assets/js/src/application.js"></script> + <script src="{{ site.baseurl }}/assets/js/src/pwa.js"></script> {% endif %} -<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> -<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script> <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script> {% if page.layout == "docs" %} -<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script> -<script type="text/javascript"> - var docsearch = docsearch({ +<script src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script> +<script> + docsearch({ apiKey: '48cb48b22351bc71ea5f12f4d1ede198', indexName: 'bootstrap-v4', inputSelector: '#search-input', @@ -47,10 +46,10 @@ {% endif %} <script> -Holder.addTheme('gray', { - bg: '#777', - fg: 'rgba(255,255,255,.75)', - font: 'Helvetica', - fontweight: 'normal' -}) + Holder.addTheme('gray', { + bg: '#777', + fg: 'rgba(255,255,255,.75)', + font: 'Helvetica', + fontweight: 'normal' + }); </script> |