Merge branch 'v4' into star-buttons

18smlee · Sep 19, 2020 · e2bc8c1 · e2bc8c1
2 parents 2acdb85 + 93ee954
commit e2bc8c1
Show file tree

Hide file tree

Showing 57 changed files with 162 additions and 61 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,8 @@ jobs:
             ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
             ${{ runner.OS }}-node-v${{ env.NODE }}-
 
+      - run: java -version
+
       - name: Install npm dependencies
         run: npm ci
 
@@ -34,3 +36,6 @@ jobs:
 
       - name: Run tests
         run: npm test
+
+      - name: Run vnu.jar tests
+        run: npm run htmllint
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -51,6 +51,7 @@ module.exports = grunt => {
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-sass');
+  grunt.loadNpmTasks('grunt-html');
 
   // Force use of Unix newlines
   grunt.util.linefeed = '\n';
@@ -148,6 +149,21 @@ module.exports = grunt => {
         dest: ''
       }
     },
+    htmllint: {
+      options: {
+        ignore: [
+          /Attribute “autocomplete” is only allowed when the input type is.*/,
+          /Attribute “autocomplete” not allowed on element “button” at this point./,
+          /Bad value “” for attribute “action” on element “form”./
+        ]
+      },
+      src: [
+        'docs/**/*.html',
+        '!docs/**/bower_components/**/*.html',
+        '!docs/_vendor/**/*.html',
+        '!docs/2/**/*.html'
+      ]
+    },
     connect: {
       options: {
         hostname: 'localhost',
@@ -238,6 +254,7 @@ module.exports = grunt => {
   });
 
   grunt.registerTask('vendor', 'copy:vendor');
+
   grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs']);
 
   grunt.registerTask('server', 'connect:keepalive');

diff --git a/docs/2/css/bootswatch.css b/docs/2/css/bootswatch.css
@@ -25,6 +25,11 @@ section {
 	margin-bottom: 15px;
 }
 
+iframe {
+  overflow: hidden;
+  border: none;
+}
+
 #social {
 	display: inline-block;
 	margin-top: 45px;

diff --git a/docs/2/img/maxcdn.gif b/docs/2/img/maxcdn.gif
diff --git a/docs/2/img/sharktankshopper.png b/docs/2/img/sharktankshopper.png
diff --git a/docs/2/img/shopify-box.png b/docs/2/img/shopify-box.png
diff --git a/docs/3/assets/css/custom.min.css b/docs/3/assets/css/custom.min.css
diff --git a/docs/3/assets/img/gridgum.png b/docs/3/assets/img/gridgum.png
diff --git a/docs/3/assets/img/logo-dark.png b/docs/3/assets/img/logo-dark.png
diff --git a/docs/3/assets/img/logo-nav.png b/docs/3/assets/img/logo-nav.png
diff --git a/docs/3/assets/img/logo.png b/docs/3/assets/img/logo.png
diff --git a/docs/3/assets/img/refs/eloquentjavascript.png b/docs/3/assets/img/refs/eloquentjavascript.png
diff --git a/docs/3/assets/img/shopify.png b/docs/3/assets/img/shopify.png
diff --git a/docs/3/assets/js/bsa.js b/docs/3/assets/js/bsa.js
diff --git a/docs/3/assets/less/custom.less b/docs/3/assets/less/custom.less
@@ -7,6 +7,11 @@ body {
   }
 }
 
+iframe {
+  overflow: hidden;
+  border: none;
+}
+
 @media (min-width: 768px) {
   body {
     > .navbar-transparent {

diff --git a/docs/3/help/index.html b/docs/3/help/index.html
@@ -160,9 +160,9 @@ <h1 id="tools">Tools</h1>
             <h1 id="support">Support</h1>
             <p>Show your support for Bootswatch by buying official gear.</p>
             <p>T-shirts based on several themes including Cyborg, Flatly, and Slate are available at <a href="https://shop.spreadshirt.com/bootswatch/">Spreadshirt</a>.</p>
-            <p><a href="https://shop.spreadshirt.com/bootswatch/"><img src="../assets/img/tshirt.jpg"></a></p>
+            <p><a href="https://shop.spreadshirt.com/bootswatch/"><img src="../assets/img/tshirt.jpg" alt="Bootswatch T-shirt"></a></p>
             <p>Stickers are available at <a href="https://www.stickermule.com/marketplace/1959-bootswatch">Sticker Mule</a>.</p>
-            <p><a href="https://www.stickermule.com/marketplace/1959-bootswatch"><img src="../assets/img/stickers.jpg"></a></p>
+            <p><a href="https://www.stickermule.com/marketplace/1959-bootswatch"><img src="../assets/img/stickers.jpg" alt="Bootswatch Stickers"></a></p>
             <p>Donations are also accepted via <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PU2DH4BMF9MWS&source=url">PayPal</a>.</p>
 
         </div>

diff --git a/docs/3/index.html b/docs/3/index.html
@@ -33,7 +33,7 @@
     <div class="navbar navbar-default navbar-fixed-top navbar-transparent">
       <div class="container">
         <div class="navbar-header">
-          <a href="./" class="navbar-brand"><img src="assets/img/logo-nav.png">Bootswatch</a>
+          <a href="./" class="navbar-brand"><img src="assets/img/logo-nav.png" alt="">Bootswatch</a>
           <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>

diff --git a/docs/3/tests/components.html b/docs/3/tests/components.html
@@ -854,7 +854,7 @@ <h4>Icons, labels, and input groups</h4>
         </div>
 
         <div class="bs-example">
-          <form role="form">
+          <form>
             <div class="form-group has-success has-feedback">
               <label class="control-label" for="inputSuccess2">Input with success</label>
               <input type="text" class="form-control" id="inputSuccess2">
@@ -1725,7 +1725,7 @@ <h3 id="navbar-forms">Forms</h3>
 
           <div class="navbar navbar-default">
             <form class="navbar-form navbar-left">
-              <select name="" class="form-control" style="width: 200px;">
+              <select class="form-control" style="width: 200px;">
                 <option value="1">1</option>
                 <option value="2">2</option>
                 <option value="3">3</option>
@@ -2865,7 +2865,7 @@ <h1 id="popovers">Popovers</h1>
       ================================================== -->
       <div class="bs-docs-section">
         <div class="page-header">
-          <h1 id="popovers">Checkbox / Radio</h1>
+          <h1 id="checkbox-radio">Checkbox / Radio</h1>
         </div>
         <div class="bs-example" style="padding-bottom: 24px;">
           <div class="btn-group" data-toggle="buttons">

diff --git a/docs/_assets/css/custom.min.css b/docs/_assets/css/custom.min.css
diff --git a/docs/_assets/img/logo-dark.png b/docs/_assets/img/logo-dark.png
diff --git a/docs/_assets/img/logo.png b/docs/_assets/img/logo.png
diff --git a/docs/_assets/img/refs/code-crunchers.png b/docs/_assets/img/refs/code-crunchers.png
diff --git a/docs/_assets/img/refs/csssecrets.png b/docs/_assets/img/refs/csssecrets.png
diff --git a/docs/_assets/img/refs/divjoy-custom.png b/docs/_assets/img/refs/divjoy-custom.png
diff --git a/docs/_assets/img/refs/divjoy-joy.png b/docs/_assets/img/refs/divjoy-joy.png
diff --git a/docs/_assets/img/refs/divjoy-light.png b/docs/_assets/img/refs/divjoy-light.png
diff --git a/docs/_assets/img/refs/eloquentjavascript.png b/docs/_assets/img/refs/eloquentjavascript.png
diff --git a/docs/_assets/img/refs/flexbox-froggy-pro.png b/docs/_assets/img/refs/flexbox-froggy-pro.png
diff --git a/docs/_assets/img/refs/grid-garden.png b/docs/_assets/img/refs/grid-garden.png
diff --git a/...hemes.3rdwavemedia.com_instance-bootstrap-portfolio-template-for-developers.png b/...hemes.3rdwavemedia.com_instance-bootstrap-portfolio-template-for-developers.png
diff --git a/...sets/img/refs/themes.3rdwavemedia.com_startupkit-startup-bootstrap-template.png b/...sets/img/refs/themes.3rdwavemedia.com_startupkit-startup-bootstrap-template.png
diff --git a/docs/_assets/scss/custom.scss b/docs/_assets/scss/custom.scss
@@ -9,6 +9,7 @@ pre {
 }
 
 iframe {
+  overflow: hidden;
   border: none;
 }
 

diff --git a/docs/cerulean/index.html b/docs/cerulean/index.html
@@ -690,13 +690,13 @@ <h1 id="forms">Forms</h1>
               </div>
 
               <div class="form-group has-success">
-                <label class="form-control-label" for="inputSuccess1">Valid input</label>
+                <label class="form-control-label" for="inputValid">Valid input</label>
                 <input type="text" value="correct value" class="form-control is-valid" id="inputValid">
                 <div class="valid-feedback">Success! You've done it.</div>
               </div>
 
               <div class="form-group has-danger">
-                <label class="form-control-label" for="inputDanger1">Invalid input</label>
+                <label class="form-control-label" for="inputInvalid">Invalid input</label>
                 <input type="text" value="wrong value" class="form-control is-invalid" id="inputInvalid">
                 <div class="invalid-feedback">Sorry, that username's taken. Try another?</div>
               </div>

diff --git a/docs/cosmo/index.html b/docs/cosmo/index.html
@@ -690,13 +690,13 @@ <h1 id="forms">Forms</h1>
               </div>
 
               <div class="form-group has-success">
-                <label class="form-control-label" for="inputSuccess1">Valid input</label>
+                <label class="form-control-label" for="inputValid">Valid input</label>
                 <input type="text" value="correct value" class="form-control is-valid" id="inputValid">
                 <div class="valid-feedback">Success! You've done it.</div>
               </div>
 
               <div class="form-group has-danger">
-                <label class="form-control-label" for="inputDanger1">Invalid input</label>
+                <label class="form-control-label" for="inputInvalid">Invalid input</label>
                 <input type="text" value="wrong value" class="form-control is-invalid" id="inputInvalid">
                 <div class="invalid-feedback">Sorry, that username's taken. Try another?</div>
               </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ pre { @@
     }
     iframe {
+      overflow: hidden;
       border: none;
     }
@@ Expand Down @@