Merge branch 'dev'

.github/workflows/.pipeline.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         php: [ 7.3 ]
         os: [ ubuntu-18.04 ]
-        wordpress: [5.8, latest]
+        wordpress: [5.8.1, latest]
         experimental: [false]
         include:
           - php: 7.4
@@ -77,6 +77,7 @@ jobs:
           export PATH="$HOME/.composer/vendor/bin:$PATH"
           composer install --no-interaction
           composer global require "phpunit/phpunit:7.5.20"
+          composer require --dev yoast/phpunit-polyfills
 
       - name: Run Lint
         run: npm run lint
@@ -90,6 +91,7 @@ jobs:
 
       - name: Run Coverage
         run: composer require pcov/clobber; vendor/bin/pcov clobber; vendor/bin/phpunit --configuration phpunit.xml --coverage-clover coverage.xml
+        if: matrix.experimental == false
 
       - name: Run Frontend Tests
         run: |
@@ -102,6 +104,7 @@ jobs:
 
       - name: Upload Coverage to Codecov
         run: bash <(curl -s https://codecov.io/bash)
+        if: matrix.experimental == false
 
       - name: Prepare Build
         if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -16,8 +16,8 @@ This theme is named after Canadian media theorist Marshall McLuhan, who coined t
 ## Requirements
 
 * PHP >= 7.3
-* WordPress >= 5.8
-* Pressbooks >= 5.27.0
+* WordPress >= 5.8.2
+* Pressbooks >= 5.30.0
 
 ## Installation
 
@@ -41,7 +41,7 @@ Then, from the GitHub Updater interface, navigate to the "Install Theme" tab. En
 
 ## Changelog
 
-### 2.13.0
+### 2.14.0
 
-* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.13.0
+* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.14.0
 * Full release history available at: https://github.com/pressbooks/pressbooks-book/releases

assets/legacy/styles/_epub-house-style.scss

@@ -71,7 +71,7 @@ h6.short-title {
 
 /* Numberless chapters have no chapter numbers */
 
-div.chapter.numberless h3.chapter-number {
+div.chapter.numberless .chapter-number {
   display: none;
 }
 

assets/legacy/styles/_pdf-house-style.scss

@@ -752,19 +752,19 @@ meta[name="pb-publisher-city"] {
 
 /* PART & CHAPTER STRINGS */
 
-.part-title-wrap h3.part-number {
+.part-title-wrap .part-number {
   string-set: part-number content();
 }
 
 .part-title-wrap h1.part-title {
   string-set: part-title content();
 }
 
-h3.chapter-number {
+.chapter-number {
   string-set: chapter-number content();
 }
 
-div.chapter.numberless h3.chapter-number {
+div.chapter.numberless .chapter-number {
   display: none;
 }
 
@@ -778,9 +778,9 @@ div.back-matter .back-matter-title-wrap > h1:first-of-type {
 /* "short title override" ... this sets short chapter title content (for running header) but does not display it.
 it can cause problems with spacing of things, so be careful to design around it */
 
-div.front-matter > div.ugc h6.short-title:first-of-type,
-div.chapter > div.ugc h6.short-title:first-of-type,
-div.back-matter > div.ugc h6.short-title:first-of-type {
+div.front-matter > div.ugc .short-title:first-of-type,
+div.chapter > div.ugc .short-title:first-of-type,
+div.back-matter > div.ugc .short-title:first-of-type {
   string-set: section-title content() !important; /* override running header */
   visibility: hidden; /* display:none breaks string-set: */
   font-size: 0;

assets/legacy/styles/_prince-toc.scss

@@ -158,6 +158,7 @@
     display: inline-block;
     width: 75%;
     text-indent: 0;
+    color: inherit;
   }
 
   /* TOC CHAPTER NUMBERS */
@@ -610,6 +611,7 @@
     display: none;
     width: 75%;
     text-indent: 0;
+    color: inherit;
   }
 
   /* TOC CHAPTER NUMBERS */

assets/src/scripts/routes/home.js

@@ -20,7 +20,7 @@ export default {
 						)
 						.prop( 'hidden', false );
 				} );
-				$target.parents( '.toc__toggle' ).attr( 'aria-expanded', 'true' );
+				$target.parents( '.toc__toggle' ).attr( 'data-expanded', 'true' );
 			} );
 
 			$( document.body ).on( 'click', '.toc__toggle #hide', function ( e ) {
@@ -36,7 +36,7 @@ export default {
 						)
 						.attr( 'hidden', 'true' );
 				} );
-				$target.parents( '.toc__toggle' ).attr( 'aria-expanded', 'false' );
+				$target.parents( '.toc__toggle' ).attr( 'data-expanded', 'false' );
 			} );
 		} );
 	},

assets/src/styles/components/_toc.scss

@@ -132,19 +132,19 @@ $light: #eee;
   text-align: center;
 }
 
-.toc__toggle[aria-expanded="false"] #hide {
+.toc__toggle[data-expanded="false"] #hide {
   display: none;
 }
 
-.toc__toggle[aria-expanded="false"] #show {
+.toc__toggle[data-expanded="false"] #show {
   display: inline-block;
 }
 
-.toc__toggle[aria-expanded="true"] #hide {
+.toc__toggle[data-expanded="true"] #hide {
   display: inline-block;
 }
 
-.toc__toggle[aria-expanded="true"] #show {
+.toc__toggle[data-expanded="true"] #show {
   display: none;
 }
 

assets/src/styles/layouts/_cover.scss

@@ -467,6 +467,10 @@
   margin-bottom: 0.5rem;
 }
 
+.block-info a, .block-meta a {
+  text-decoration: underline;
+}
+
 #content .license-attribution {
   img {
     height: 2em;

dist/mix-manifest.json

@@ -1,11 +1,11 @@
 {
-    "/scripts/book.js": "/scripts/book.js?id=e66e96b2f7d5e73debc8",
+    "/scripts/book.js": "/scripts/book.js?id=e9e6c9579c3aa2a2b5f7",
     "/scripts/pane.js": "/scripts/pane.js?id=7e5b385cb135973c79f7",
     "/scripts/collapse-sections.js": "/scripts/collapse-sections.js?id=b902d882dd21410b4387",
     "/scripts/lightbox.js": "/scripts/lightbox.js?id=cb2b7b2a5fb303c3095d",
-    "/styles/book.css": "/styles/book.css?id=f47ba7caaba9ec75c5f3",
+    "/styles/book.css": "/styles/book.css?id=c427332d12f4f3dab967",
     "/styles/web-house-style.css": "/styles/web-house-style.css?id=f2ec506de7eae2e9ddc5",
-    "/scripts/sharer.js": "/scripts/sharer.js?id=3ac949166b7d8d866f7a",
+    "/scripts/sharer.js": "/scripts/sharer.js?id=726d50806d381e7cf7d0",
     "/scripts/lity.js": "/scripts/lity.js?id=b91ed0405760d2e124c1",
     "/scripts/details-element-polyfill.js": "/scripts/details-element-polyfill.js?id=60ad7c2161011e153d53",
     "/styles/lity.css": "/styles/lity.css?id=2b05d25ddc82cd96736b",