Merge branch 'master' into v7.0

Author: roblarsen

.travis.yml

@@ -2,23 +2,6 @@
 # in this file, please see the Travis CI documentation:
 # https://docs.travis-ci.com
 
-after_success:
-  - |
-
-      # Automatically update the content from the `dist/` directory
-
-      $(npm bin)/travis-after-all \
-        && $(npm bin)/set-up-ssh -k "$encrypted_7289798db853_key" \
-                                 -iv "$encrypted_7289798db853_iv" \
-                                 --path-encrypted-key ".travis/github_deploy_key.enc" \
-        && $(npm bin)/commit-changes --branch "master" \
-                                     --commands "npm run build" \
-                                     --commit-message "Update content from the \`dist\` directory [skip ci]"
-
-env:
-  global:
-    - secure: "uZ0R71TG9AR+kbfM9rwa8PPNr3f9E0C4OuA0s6g0Gq15bBcpVxPvus0/eJdW+O2NSzZE1GbzS//hBiP+chK/8X4DyNIRutlGk5RYdnTTFEaZo9jp0BvlvprUYlGgpprR/531zQ9ahkc0STwVvzurGzlcF4NNMiISAJJ1IdQZABc="
-
 git:
   depth: 10
 

dist/css/main.css

@@ -1,16 +1,18 @@
 /*! HTML5 Boilerplate v6.1.0 | MIT License | https://html5boilerplate.com/ */
 
+/* main.css 1.0.0 | MIT License | https://github.com/h5bp/main.css#readme */
 /*
  * What follows is the result of much research on cross-browser styling.
  * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
  * Kroc Camen, and the H5BP dev community and team.
  */
 
+ 
 /* ==========================================================================
    Base styles: opinionated defaults
    ========================================================================== */
 
-html {
+   html {
     color: #222;
     font-size: 1em;
     line-height: 1.4;
@@ -93,7 +95,10 @@ textarea {
     padding: 0.2em 0;
 }
 
-/* ==========================================================================
+
+
+
+ /* ==========================================================================
    Author's custom styles
    ========================================================================== */
 
@@ -112,94 +117,94 @@ textarea {
 
 
 
-
-/* ==========================================================================
+ /* ==========================================================================
    Helper classes
    ========================================================================== */
 
 /*
  * Hide visually and from screen readers
  */
 
-.hidden {
-    display: none !important;
+ .hidden {
+  display: none !important;
 }
 
 /*
- * Hide only visually, but have it available for screen readers:
- * https://snook.ca/archives/html_and_css/hiding-content-for-accessibility
- *
- * 1. For long content, line feeds are not interpreted as spaces and small width
- *    causes content to wrap 1 word per line:
- *    https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
- */
+* Hide only visually, but have it available for screen readers:
+* https://snook.ca/archives/html_and_css/hiding-content-for-accessibility
+*
+* 1. For long content, line feeds are not interpreted as spaces and small width
+*    causes content to wrap 1 word per line:
+*    https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
+*/
 
 .visuallyhidden {
-    border: 0;
-    clip: rect(0 0 0 0);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
-    white-space: nowrap; /* 1 */
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+  white-space: nowrap; /* 1 */
 }
 
 /*
- * Extends the .visuallyhidden class to allow the element
- * to be focusable when navigated to via the keyboard:
- * https://www.drupal.org/node/897638
- */
+* Extends the .visuallyhidden class to allow the element
+* to be focusable when navigated to via the keyboard:
+* https://www.drupal.org/node/897638
+*/
 
 .visuallyhidden.focusable:active,
 .visuallyhidden.focusable:focus {
-    clip: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    position: static;
-    width: auto;
-    white-space: inherit;
+  clip: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  position: static;
+  width: auto;
+  white-space: inherit;
 }
 
 /*
- * Hide visually and from screen readers, but maintain layout
- */
+* Hide visually and from screen readers, but maintain layout
+*/
 
 .invisible {
-    visibility: hidden;
+  visibility: hidden;
 }
 
 /*
- * Clearfix: contain floats
- *
- * For modern browsers
- * 1. The space content is one way to avoid an Opera bug when the
- *    `contenteditable` attribute is included anywhere else in the document.
- *    Otherwise it causes space to appear at the top and bottom of elements
- *    that receive the `clearfix` class.
- * 2. The use of `table` rather than `block` is only necessary if using
- *    `:before` to contain the top-margins of child elements.
- */
+* Clearfix: contain floats
+*
+* For modern browsers
+* 1. The space content is one way to avoid an Opera bug when the
+*    `contenteditable` attribute is included anywhere else in the document.
+*    Otherwise it causes space to appear at the top and bottom of elements
+*    that receive the `clearfix` class.
+* 2. The use of `table` rather than `block` is only necessary if using
+*    `:before` to contain the top-margins of child elements.
+*/
 
 .clearfix:before,
 .clearfix:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
+  content: " "; /* 1 */
+  display: table; /* 2 */
 }
 
 .clearfix:after {
-    clear: both;
+  clear: both;
 }
 
+ 
 /* ==========================================================================
    EXAMPLE Media Queries for Responsive Design.
    These examples override the primary ('mobile first') styles.
    Modify as content requires.
    ========================================================================== */
 
-@media only screen and (min-width: 35em) {
+   @media only screen and (min-width: 35em) {
     /* Style adjustments for viewports that meet the condition */
 }
 
@@ -210,13 +215,14 @@ textarea {
     /* Style adjustments for high resolution devices */
 }
 
+ 
 /* ==========================================================================
    Print styles.
    Inlined to avoid the additional HTTP request:
    https://www.phpied.com/delay-loading-your-print-css/
    ========================================================================== */
 
-@media print {
+   @media print {
     *,
     *:before,
     *:after {
@@ -285,3 +291,5 @@ textarea {
         page-break-after: avoid;
     }
 }
+
+

dist/site.webmanifest

@@ -1,8 +1,12 @@
 {
-    "icons": [{
-        "src": "icon.png",
-        "sizes": "192x192",
-        "type": "image/png"
-    }],
-    "start_url": "/"
+  "short_name": "",
+  "name": "",
+  "icons": [{
+    "src": "icon.png",
+    "type": "image/png",
+    "sizes": "192x192"
+  }],
+  "start_url": "/?utm_source=homescreen",
+  "background_color": "#fafafa",
+  "theme_color": "#fafafa"
 }

gulpfile.babel.js

@@ -118,10 +118,9 @@ gulp.task('copy:license', () =>
 );
 
 gulp.task('copy:main.css', () => {
-
   const banner = `/*! HTML5 Boilerplate v${pkg.version} | ${pkg.license} License | ${pkg.homepage} */\n\n`;
 
-  gulp.src(`${dirs.src}/css/main.css`)
+  gulp.src(`node_modules/main.css/dist/main.css`)
     .pipe(plugins().header(banner))
     .pipe(plugins().autoprefixer({
       browsers: ['last 2 versions', 'ie >= 9', '> 1%'],

package.json

@@ -1,6 +1,5 @@
 {
   "devDependencies": {
-    "@alrra/travis-scripts": "^3.0.1",
     "apache-server-configs": "^3.0.0",
     "archiver": "^3.0.0",
     "babel-core": "^6.26.3",
@@ -20,13 +19,13 @@
     "gulp-rename": "^1.4.0",
     "gulp-replace": "^1.0.0",
     "jquery": "3.3.1",
+    "main.css": "1.0.0",
     "mocha": "^5.2.0",
     "modernizr": "3.6.0",
     "normalize.css": "8.0.0",
     "run-sequence": "^2.2.1",
     "ssri": "^6.0.1",
-    "strip-json-comments": "^2.0.1",
-    "travis-after-all": "^1.4.5"
+    "strip-json-comments": "^2.0.1"
   },
   "engines": {
     "node": ">=6",