Skip to content

Commit

Permalink
Merge pull request #2121 from roblarsen/7.1.1
Browse files Browse the repository at this point in the history
Upgrading modernizr and bumping version
  • Loading branch information
roblarsen authored Mar 18, 2019
2 parents 751dc34 + 58618a2 commit f383380
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
### 7.1.0 (March 18, 2019)

* Update Modernizr to 3.7.1 ([#2121](https://github.com/h5bp/html5-boilerplate/pull/2121))
* Update Analytics docs and snippet ([#2118](https://github.com/h5bp/html5-boilerplate/pull/2118))
* Minor docs updates ([#2115](https://github.com/h5bp/html5-boilerplate/pull/2115))
* Minor devdeps updates ([#2114](https://github.com/h5bp/html5-boilerplate/pull/2114))
* More succinct way of writing the IE conditional statement ([#2113](https://github.com/h5bp/html5-boilerplate/pull/2113))

### 7.0.1 (February 11, 2019)

* Bumps main.css to current version ([#2112](https://github.com/h5bp/html5-boilerplate/pull/2112))

### 7.0.0 (February 8, 2019)
Expand Down
2 changes: 1 addition & 1 deletion dist/css/main.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! HTML5 Boilerplate v7.0.1 | MIT License | https://html5boilerplate.com/ */
/*! HTML5 Boilerplate v7.1.0 | MIT License | https://html5boilerplate.com/ */

/* main.css 1.0.0 | MIT License | https://github.com/h5bp/main.css#readme */
/*
Expand Down
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- Add your site or application content here -->
<p>Hello world! This is HTML5 Boilerplate.</p>
<script src="js/vendor/modernizr-3.7.0.min.js"></script>
<script src="js/vendor/modernizr-3.7.1.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-3.3.1.min.js"><\/script>')</script>
<script src="js/plugins.js"></script>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"babel-core": "^6.26.3",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
"del": "^3.0.0",
"eslint": "^5.14.1",
"del": "^4.0.0",
"eslint": "^5.15.2",
"eslint-config-recommended": "^4.0.0",
"eslint-plugin-mocha": "^5.3.0",
"glob": "^7.1.3",
Expand All @@ -21,7 +21,7 @@
"jquery": "3.3.1",
"main.css": "1.0.0",
"mocha": "^5.2.0",
"modernizr": "3.7.0",
"modernizr": "3.7.1",
"normalize.css": "8.0.1",
"run-sequence": "^2.2.1",
"ssri": "^6.0.1",
Expand Down Expand Up @@ -51,7 +51,7 @@
"build": "gulp build",
"test": "gulp archive && mocha --require babel-core/register --reporter spec --timeout 5000"
},
"version": "7.0.1",
"version": "7.1.0",
"description": "A professional front-end template for building fast, robust, and adaptable web apps or sites.",
"files": [
"CHANGELOG.md",
Expand Down

0 comments on commit f383380

Please sign in to comment.