diff --git a/.travis.yml b/.travis.yml
index b57eb6c2606cc9edf7e602d164494126f0621916..f87759abda01c5e7b64797f3b78a728dbf2a3e12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
-sudo: false
+sudo: required
+dist: trusty
language: node_js
git:
depth: 10
diff --git a/Gruntfile.js b/Gruntfile.js
index 31068766c14bcc3419d3183bd783e6ea3a175a12..67cbc50781f50ea211da7c4361be22e80cf69786 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -327,8 +327,7 @@ module.exports = function (grunt) {
'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.',
- 'Attribute “integrity†not allowed on element “script†at this point.' // Until https://github.com/jzaefferer/grunt-html/issues/86 gets fixed
+ 'The “week†input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.'
]
},
src: ['_gh_pages/**/*.html', 'js/tests/visual/*.html']
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3b912c3228f14d541f5b34a07cee441e52b5cbef..561d4110cad450ce8c5dc7a7101fe2bb7a1caefc 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,4 +1,4 @@
-<footer class="bd-footer text-muted" role="contentinfo">
+<footer class="bd-footer text-muted">
<div class="container">
<ul class="bd-footer-links">
<li><a href="{{ site.repo }}">GitHub</a></li>
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index a347a5f7cd278e1187abc4cfd369862be3c57e31..0436e2dbe79f8d7e12f0fc207e3151de482e9596 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,4 +1,4 @@
-<header class="navbar navbar-light navbar-static-top bd-navbar" role="banner">
+<header class="navbar navbar-light navbar-static-top bd-navbar">
<div class="container">
{% comment %}
<nav class="nav navbar-nav pull-xs-right">
diff --git a/docs/components/scrollspy.md b/docs/components/scrollspy.md
index 4ae0fa219dc9772c77033bb9c3a77c296f634ed2..622469aa10ba61087ff295a71a7ef65a31aa385b 100644
--- a/docs/components/scrollspy.md
+++ b/docs/components/scrollspy.md
@@ -14,7 +14,7 @@ group: components
The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.
<div class="bd-example">
- <nav id="navbar-example2" class="navbar navbar-default" role="navigation">
+ <nav id="navbar-example2" class="navbar navbar-default">
<h3 class="navbar-brand">Project Name</h3>
<ul class="nav nav-pills">
<li class="nav-item"><a class="nav-link" href="#fat">@fat</a></li>
diff --git a/docs/index.html b/docs/index.html
index dee6567886494c67158e6f0aaa741149659f2756..6f88f4254a238b64f92f198fc90c7c0364f985b3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@ layout: home
title: Bootstrap · The world's most popular mobile-first and responsive front-end framework.
---
-<main class="bd-masthead" id="content" role="main">
+<main class="bd-masthead" id="content">
<div class="container">
<span class="bd-booticon outline">B</span>
<p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework in the world for building responsive, mobile-first projects on the web.</p>
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index eb4c9acc10d4ee236e3cea122bf3b593fb0f3142..85d08952f2c20f5c9c335bd26a9cb9663efee13e 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -1173,20 +1173,12 @@
"resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
},
"grunt-html": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-5.0.1.tgz",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-6.0.0.tgz",
"dependencies": {
"async": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
- },
- "chalk": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz"
- },
- "supports-color": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-1.5.1.tgz"
}
}
},
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index f0d6f159e0b3a51a7193950d226f800bf0ca756a..11474728ec5566ac371dfaa6b87816b05ee60d56 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -15,7 +15,7 @@
<h1>Dropdown <small>Bootstrap Visual Test</small></h1>
</div>
- <nav id="navbar-example" class="navbar navbar-light bg-faded" role="navigation">
+ <nav id="navbar-example" class="navbar navbar-light bg-faded">
<button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
☰
</button>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index dc1dfc82fef9f83528c0e0d1287aeb7066cf3bb6..efe6f593bb4432d4c9a728b99b3cfff87c8f80bd 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -14,7 +14,7 @@
<div class="container">
- <nav class="navbar navbar-dark navbar-fixed-top bg-inverse" role="navigation">
+ <nav class="navbar navbar-dark navbar-fixed-top bg-inverse">
<div class="js-navbar-scrollspy">
<ul class="nav navbar-nav">
<li class="nav-item"><a class="nav-link active" href="#fat">@fat</a></li>
diff --git a/package.json b/package.json
index b2494c6e23882a91284b1c85bfadfae52e3de0ac..d02e6d6a6e6efaabd3ce7e089598973df43c3b34 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"grunt-contrib-watch": "~0.6.1",
"grunt-eslint": "^17.1.0",
"grunt-exec": "~0.4.6",
- "grunt-html": "~5.0.0",
+ "grunt-html": "~6.0.0",
"grunt-jekyll": "~0.4.2",
"grunt-jscs": "~2.7.0",
"grunt-line-remover": "0.0.2",