Merge branch 'dev'

.github/dependabot.yml

@@ -0,0 +1,53 @@
+version: 2
+updates:
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `package-lock.json` files in the root directory
+    directory: "/"
+    # Check for updates monthly
+    schedule:
+      interval: "monthly"
+    allow:
+      # Allow direct updates only (for packages named in package.json)
+      - dependency-type: "direct"
+    # Allow up to 10 open pull requests for npm dependencies
+    open-pull-requests-limit: 10
+
+  # Maintain dependencies for npm (aetna)
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `package-lock.json` files in the root directory
+    directory: "/packages/aetna"
+    # Check for updates monthly
+    schedule:
+      interval: "monthly"
+    allow:
+      # Allow direct updates only (for packages named in package.json)
+      - dependency-type: "direct"
+    # Allow up to 10 open pull requests for npm dependencies
+    open-pull-requests-limit: 10
+
+  # Maintain dependencies for npm (aetna)
+  - package-ecosystem: "npm"
+    # Look for `package.json` and `package-lock.json` files in the root directory
+    directory: "/packages/buckram"
+    # Check for updates monthly
+    schedule:
+      interval: "monthly"
+    allow:
+      # Allow direct updates only (for packages named in package.json)
+      - dependency-type: "direct"
+    # Allow up to 10 open pull requests for npm dependencies
+    open-pull-requests-limit: 10
+
+  # Maintain dependencies for Composer
+  - package-ecosystem: "composer"
+    # Look for `composer.json` and `composer.lock` files in the root directory
+    directory: "/"
+    # Check for updates monthly
+    schedule:
+      interval: "monthly"
+    allow:
+      # Allow direct updates only (for packages named in composer.json)
+      - dependency-type: "direct"
+    # Allow up to 10 open pull requests for composer dependencies
+    open-pull-requests-limit: 10

.github/workflows/.pipeline.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         php: [ 7.3 ]
         os: [ ubuntu-18.04 ]
-        wordpress: [ 5.7.2, latest]
+        wordpress: [ 5.8, latest]
 
     name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
 
@@ -57,8 +57,6 @@ jobs:
           npm install -g lerna
           npm install
           npm run bootstrap
-          npm run install-build-tools
-          lerna run install-build-tools
           export PATH="$HOME/.composer/vendor/bin:$PATH"
           composer install --no-interaction
           composer global require "phpunit/phpunit:7.5.20"

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.7.2
-* Pressbooks >= 5.24.0
+* WordPress >= 5.8
+* Pressbooks >= 5.26.0
 
 ## Installation
 
@@ -41,7 +41,7 @@ Then, from the GitHub Updater interface, navigate to the "Install Theme" tab. En
 
 ## Changelog
 
-### 2.11.3
+### 2.12.0
 
-* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.11.3
+* See: https://github.com/pressbooks/pressbooks-book/releases/tag/2.12.0
 * Full release history available at: https://github.com/pressbooks/pressbooks-book/releases

assets/src/styles/layouts/_page.scss

@@ -31,13 +31,38 @@ body:not(.home) #content h2.denied-title {
   font-family: $font-family-sans-serif;
   font-size: 1.5rem;
   text-align: center;
-  margin: 2rem 0 4rem;
+  margin: 2rem 0 1rem;
 
   &:before {
     display: none;
   }
 }
 
+#content p.h5p-count {
+  font-family: $font-family-sans-serif;
+  text-align: center;
+  margin-bottom: 1.5rem;
+}
+
+#h5p-show-hide {
+  margin-left: .3rem;
+}
+
+#h5p-listing-table {
+  border-bottom: 1px solid $table-border-color;
+}
+
+#content .h5p-pagination {
+  padding-top: 1rem;
+  margin: 0 auto;
+  text-align: center;
+  font-family: $font-family-sans-serif;
+  .page-numbers {
+    font-size: 1.2rem;
+    padding: 0.3rem;
+  }
+}
+
 .blog #content h3 {
   text-indent: 0;
 }

composer.json

@@ -15,7 +15,7 @@
 		"soberwp/intervention": "1.2.0-p"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~6.5",
+		"phpunit/phpunit": "~7.5",
 		"pressbooks/coding-standards": "^1.0",
 		"wpreadme2markdown/wp2md": "^3.0"
 	},