From e9323459ab226d9eb0d15217707c1ce12cf490eb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 16 Jul 2017 14:58:52 +0300 Subject: [PATCH 1/2] New favicons. Include everything for most browsers to work including Android. Kept favicon.ico to the root dir. Also added a manifest.json for PWA. --- _includes/favicons.html | 9 +++++++ _includes/header.html | 6 +---- apple-touch-icon.png | Bin 6140 -> 0 bytes .../img/favicons/android-chrome-192x192.png | Bin 0 -> 1935 bytes .../img/favicons/android-chrome-512x512.png | Bin 0 -> 8745 bytes assets/img/favicons/apple-touch-icon.png | Bin 0 -> 1738 bytes assets/img/favicons/browserconfig.xml | 11 +++++++++ assets/img/favicons/favicon-16x16.png | Bin 0 -> 310 bytes assets/img/favicons/favicon-32x32.png | Bin 0 -> 491 bytes assets/img/favicons/manifest.json | 22 ++++++++++++++++++ assets/img/favicons/mstile-144x144.png | Bin 0 -> 1479 bytes assets/img/favicons/mstile-150x150.png | Bin 0 -> 1428 bytes assets/img/favicons/mstile-310x150.png | Bin 0 -> 1746 bytes assets/img/favicons/mstile-310x310.png | Bin 0 -> 3085 bytes assets/img/favicons/mstile-70x70.png | Bin 0 -> 1104 bytes assets/img/favicons/safari-pinned-tab.svg | 20 ++++++++++++++++ 16 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 _includes/favicons.html delete mode 100644 apple-touch-icon.png create mode 100644 assets/img/favicons/android-chrome-192x192.png create mode 100644 assets/img/favicons/android-chrome-512x512.png create mode 100644 assets/img/favicons/apple-touch-icon.png create mode 100644 assets/img/favicons/browserconfig.xml create mode 100644 assets/img/favicons/favicon-16x16.png create mode 100644 assets/img/favicons/favicon-32x32.png create mode 100644 assets/img/favicons/manifest.json create mode 100644 assets/img/favicons/mstile-144x144.png create mode 100644 assets/img/favicons/mstile-150x150.png create mode 100644 assets/img/favicons/mstile-310x150.png create mode 100644 assets/img/favicons/mstile-310x310.png create mode 100644 assets/img/favicons/mstile-70x70.png create mode 100644 assets/img/favicons/safari-pinned-tab.svg diff --git a/_includes/favicons.html b/_includes/favicons.html new file mode 100644 index 0000000000..97dab4ba8f --- /dev/null +++ b/_includes/favicons.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/_includes/header.html b/_includes/header.html index d9eac3db30..c7e5dbd9e5 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,14 +21,10 @@ {% if page.layout == "docs" %} - + {% endif %} - - - - + {% endif %} diff --git a/assets/js/src/pwa.js b/assets/js/src/pwa.js new file mode 100644 index 0000000000..95ee339482 --- /dev/null +++ b/assets/js/src/pwa.js @@ -0,0 +1,15 @@ +/* eslint no-console:off */ + +(function setupSW() { + 'use strict' + + if ('serviceWorker' in navigator) { + window.addEventListener('load', function () { + navigator.serviceWorker.register('/sw.js').then(function (registration) { + console.log('ServiceWorker registration successful with scope: ', registration.scope) + }).catch(function (err) { + console.log('ServiceWorker registration failed: ', err) + }) + }) + } +}()) diff --git a/package.json b/package.json index 0f0618284a..a88d0498b1 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed \"s/^(import|export).*//\" | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js", "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps", "js-minify": "uglifyjs --config-file build/uglifyjs.config.json --output dist/js/bootstrap.min.js dist/js/bootstrap.js", - "js-minify-docs": "uglifyjs --config-file build/uglifyjs.config.json --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js", + "js-minify-docs": "uglifyjs --config-file build/uglifyjs.config.json --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js assets/js/src/pwa.js", "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60", "js-test-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit", "docs": "npm-run-all docs-compile docs-lint", diff --git a/sw.js b/sw.js new file mode 100644 index 0000000000..44d1d2774a --- /dev/null +++ b/sw.js @@ -0,0 +1 @@ +// empty for now