From 19d6301506bfde60eb7a93a1a6a0532cb79f6e0f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Dec 2015 18:30:25 -0700 Subject: [PATCH 1/3] docs: Add SRI hash for jQuery; refs #18665 --- _config.yml | 1 + docs/_includes/footer.html | 2 +- docs/examples/album/index.html | 2 +- docs/examples/blog/index.html | 2 +- docs/examples/carousel/index.html | 2 +- docs/examples/cover/index.html | 2 +- docs/examples/dashboard/index.html | 2 +- docs/examples/jumbotron/index.html | 2 +- docs/examples/navbar-top-fixed/index.html | 2 +- docs/examples/navbar-top/index.html | 2 +- docs/examples/navbar/index.html | 2 +- docs/examples/offcanvas/index.html | 2 +- docs/examples/starter-template/index.html | 2 +- docs/examples/sticky-footer-navbar/index.html | 2 +- docs/examples/tooltip-viewport/index.html | 2 +- docs/getting-started/introduction.md | 4 ++-- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/_config.yml b/_config.yml index 31769dc1b9..9289f84bea 100644 --- a/_config.yml +++ b/_config.yml @@ -42,4 +42,5 @@ cdn: js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js js_hash: "sha384-vZ2WRJMwsjRMW/8U7i6PWi6AlO1L79snBrmgiDpgIWJ82z8eA5lenwvxbMV1PAh7" jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js + jquery_hash: "sha384-8gBf6Y4YYq7Jx97PIqmTwLPin4hxIzQw5aDmUg/DDhul9fFpbbLcLh3nTIIDJKhx" tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.1.1/js/tether.min.js diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 7bcaa39835..662ea1133c 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -11,7 +11,7 @@ - + diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index 0337d33b45..5cb879b029 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -115,7 +115,7 @@ - + diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index d73f5ec690..49702301ec 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -158,7 +158,7 @@ - + diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index b2faa54647..e098222a47 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -174,7 +174,7 @@ - + diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index 71c3842963..41af1e945e 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -60,7 +60,7 @@ - + diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 31f6e8becb..ec1025cab6 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -224,7 +224,7 @@ - + diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index f57cf7df7d..db005b9926 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -75,7 +75,7 @@ - + diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html index 24c706a31e..49bca42dd5 100644 --- a/docs/examples/navbar-top-fixed/index.html +++ b/docs/examples/navbar-top-fixed/index.html @@ -45,7 +45,7 @@ - + diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html index ea2c409d66..28a24ab556 100644 --- a/docs/examples/navbar-top/index.html +++ b/docs/examples/navbar-top/index.html @@ -43,7 +43,7 @@ - + diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index a6d6422979..05e25bd58e 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -64,7 +64,7 @@ - + diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index fcba688869..0b51c2453a 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -104,7 +104,7 @@ - + diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index fe28223f30..0c64b0fc69 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -48,7 +48,7 @@ - + diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index ed64a7d90c..22204df711 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -73,7 +73,7 @@ - + diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index c50a074295..03110f8736 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -39,7 +39,7 @@ - + diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md index b35c4134b7..51f9ab6cc1 100644 --- a/docs/getting-started/introduction.md +++ b/docs/getting-started/introduction.md @@ -27,7 +27,7 @@ Copy-paste the stylesheet `` into your `` before all other styleshee Add our JavaScript plugins, jQuery, and Tether near the end of your pages, right before the closing `` tag. Be sure to place jQuery and Tether first, as our code depends on them. {% highlight html %} - + {% endhighlight %} @@ -60,7 +60,7 @@ Put it all together and your pages should look like this:

Hello, world!

- + From 9304f23ad887d2151659f7958244af816af1ac95 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Dec 2015 18:35:11 -0700 Subject: [PATCH 2/3] docs: Add SRI hash for Tether; refs #18665 --- _config.yml | 1 + docs/examples/album/index.html | 2 +- docs/examples/blog/index.html | 2 +- docs/examples/carousel/index.html | 2 +- docs/examples/cover/index.html | 2 +- docs/examples/dashboard/index.html | 2 +- docs/examples/jumbotron/index.html | 2 +- docs/examples/navbar-top-fixed/index.html | 2 +- docs/examples/navbar-top/index.html | 2 +- docs/examples/navbar/index.html | 2 +- docs/examples/offcanvas/index.html | 2 +- docs/examples/starter-template/index.html | 2 +- docs/examples/sticky-footer-navbar/index.html | 2 +- docs/examples/tooltip-viewport/index.html | 2 +- docs/getting-started/introduction.md | 4 ++-- 15 files changed, 16 insertions(+), 15 deletions(-) diff --git a/_config.yml b/_config.yml index 9289f84bea..89dc3368ef 100644 --- a/_config.yml +++ b/_config.yml @@ -44,3 +44,4 @@ cdn: jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js jquery_hash: "sha384-8gBf6Y4YYq7Jx97PIqmTwLPin4hxIzQw5aDmUg/DDhul9fFpbbLcLh3nTIIDJKhx" tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.1.1/js/tether.min.js + tether_hash: "sha384-MWq1Lnqj72tmjGdOKuNBn3E0gj3vWfy/1EmR5TVL8d8nGvwgy32YkCpKpTUhwBVv" diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index 5cb879b029..c80618adcc 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -117,7 +117,7 @@ - + - + diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index e098222a47..5e01f8df04 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -176,7 +176,7 @@ - + diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index 41af1e945e..f97adf61ee 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -62,7 +62,7 @@ - + diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index ec1025cab6..a86e3ecb9f 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -226,7 +226,7 @@ - + diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index db005b9926..3e362fb46a 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -77,7 +77,7 @@ - + diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html index 49bca42dd5..c6adfae215 100644 --- a/docs/examples/navbar-top-fixed/index.html +++ b/docs/examples/navbar-top-fixed/index.html @@ -47,7 +47,7 @@ - + diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html index 28a24ab556..d6c5b0a9ed 100644 --- a/docs/examples/navbar-top/index.html +++ b/docs/examples/navbar-top/index.html @@ -45,7 +45,7 @@ - + diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index 05e25bd58e..f17722a85c 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -66,7 +66,7 @@ - + diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 0b51c2453a..16a70b3799 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -106,7 +106,7 @@ - + diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index 0c64b0fc69..b736ae161c 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -50,7 +50,7 @@ - + diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 22204df711..c1555759b8 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -75,7 +75,7 @@ - + diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index 03110f8736..8ce4f1a3d9 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -41,7 +41,7 @@ - + diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md index 51f9ab6cc1..8cec71fd6c 100644 --- a/docs/getting-started/introduction.md +++ b/docs/getting-started/introduction.md @@ -28,7 +28,7 @@ Add our JavaScript plugins, jQuery, and Tether near the end of your pages, right {% highlight html %} - + {% endhighlight %} @@ -61,7 +61,7 @@ Put it all together and your pages should look like this: - + From 71443c503416156a3abbd0e617acee376fc4f14e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 10 Jan 2016 23:53:17 -0800 Subject: [PATCH 3/3] HTML validation: Ignore spurious errors about script[integrity] Workaround for https://github.com/jzaefferer/grunt-html/issues/86 --- Gruntfile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index c4407332dc..ba99798967 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -343,12 +343,14 @@ module.exports = function (grunt) { 'Attribute “autocomplete” not allowed on element “button” at this point.', 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)', 'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).', + 'The “datetime” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', 'The “color” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', 'The “date” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', 'The “datetime-local” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', 'The “month” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', 'The “time” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', - 'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.' + 'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.', + 'Attribute “integrity” not allowed on element “script” at this point.' // Until https://github.com/jzaefferer/grunt-html/issues/86 gets fixed ] }, src: ['_gh_pages/**/*.html', 'js/tests/visual/*.html']