Merge branch 'trunk' into add/new-link-in-bio-pattern

README.md

@@ -46,7 +46,7 @@ By contributing code to our free themes, you grant its use under the [GNU Genera
 
 Themes code should adhere to the [WordPress coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/). This repo contains a pre-commit hook which enables you to detect and fix code that doesn't follow the standards.
 
-To set this uo follow these instructions:
+To set this up follow these instructions:
 1. Run `npm i` in the root of the repo.
 2. Run `composer install`
 
@@ -74,4 +74,4 @@ NOTE: When pushing changes if your local branch is not current with /trunk you w
 
 - In addition to pushing your local changes you can also WATCH for any local changes and trigger the sandbox sync by using the `npm run sandbox:watch` Any changes to your local files will trigger the rsync.  Make sure that you have executed `npm install` to ensure the needed dependencies for this are installed.
 
-Note: The first time you run the `sandbox.sh` shell script you will be prompted for details about your sandbox which will be stored in a `.sandbox-config` file. Edit (or delete and be re-prompted) if details about your sandbox change.  This file will not be comitted to version controll and will not sync to your sandbox.
+Note: The first time you run the `sandbox.sh` shell script you will be prompted for details about your sandbox which will be stored in a `.sandbox-config` file. Edit (or delete and be re-prompted) if details about your sandbox change.  This file will not be comitted to version controll and will not sync to your sandbox.

alves/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "alves",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

alves/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alves",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Alves",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

alves/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

alves/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #2f5f74;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
 	color: #ffffff;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 48px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: #ffffff;
 	background-color: #2f5f74;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #ffffff;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;
@@ -1710,8 +1695,6 @@ p:not(.site-title) a:hover {
 	width: 100%;
 }
 
-.fse-template-part .main-navigation button,
-.fse-template-part .main-navigation input[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link,
 .fse-template-part .main-navigation .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
@@ -1728,12 +1711,8 @@ p:not(.site-title) a:hover {
 	padding: 16px 48px;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
-.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
-.fse-template-part .main-navigation .wp-block-button__link:after,
+.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -1741,29 +1720,19 @@ p:not(.site-title) a:hover {
 	width: 0;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
 .fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
 .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-.fse-template-part .main-navigation button:not(.has-background):hover,
-.fse-template-part .main-navigation input:not(.has-background):hover[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link:not(.has-background):hover,
-.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation button:focus,
-.fse-template-part .main-navigation input:focus[type="submit"],
-.fse-template-part .main-navigation .wp-block-button__link:focus,
-.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation button.has-focus,
-.fse-template-part .main-navigation input.has-focus[type="submit"],
-.fse-template-part .main-navigation .has-focus.wp-block-button__link,
+.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation .wp-block-button__link:focus,
+.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation .has-focus.wp-block-button__link,
 .fse-template-part .main-navigation .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: #ffffff;
 	background-color: #2f5f74;

alves/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #2f5f74;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #2f5f74;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #ffffff;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

alves/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #2f5f74;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #2f5f74;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #ffffff;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

balasana/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "balasana",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

balasana/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balasana",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Balasana",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

balasana/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

balasana/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #145f3e;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: #FFFFFF;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: #FFFFFF;
 	background-color: #145f3e;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

balasana/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #145f3e;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #145f3e;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

balasana/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #145f3e;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #145f3e;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

barnsbury/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

barnsbury/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Barnsbury",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

barnsbury/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #133a24;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: #FFFDF6;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 18px 18px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: ("default": #FFFDF6, "light": #FDF9EC, "dark": #DDDDDD);
 	background-color: #133a24;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

barnsbury/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #133a24;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #133a24;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

barnsbury/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #133a24;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #133a24;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFDF6;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

blank-canvas/functions.php

@@ -72,11 +72,11 @@ add_action( 'after_setup_theme', 'blank_canvas_setup', 11 );
  */
 function blank_canvas_colors() {
 	return array(
-		array( '--global--color-background', '#FFFFFF', __( 'Background Color', 'seedlet' ) ),
-		array( '--global--color-foreground', '#333333', __( 'Foreground Color', 'seedlet' ) ),
-		array( '--global--color-primary', '#000000', __( 'Primary Color', 'seedlet' ) ),
-		array( '--global--color-secondary', '#007cba', __( 'Secondary Color', 'seedlet' ) ),
-		array( '--global--color-tertiary', '#FAFAFA', __( 'Tertiary Color', 'seedlet' ) ),
+		array( '--global--color-background', '#FFFFFF', __( 'Background Color', 'blank-canvas' ) ),
+		array( '--global--color-foreground', '#333333', __( 'Foreground Color', 'blank-canvas' ) ),
+		array( '--global--color-primary', '#000000', __( 'Primary Color', 'blank-canvas' ) ),
+		array( '--global--color-secondary', '#007cba', __( 'Secondary Color', 'blank-canvas' ) ),
+		array( '--global--color-tertiary', '#FAFAFA', __( 'Tertiary Color', 'blank-canvas' ) ),
 	);
 }
 add_filter( 'seedlet_colors', 'blank_canvas_colors' );
@@ -179,14 +179,6 @@ add_action( 'wp_enqueue_scripts', 'blank_canvas_enqueue', 11 );
  */
 require get_stylesheet_directory() . '/inc/block-patterns.php';
 
-/**
- * Enqueue CSS for Customizer message.
- */
-function blank_canvas_customizer_enqueue() {
-	wp_enqueue_style( 'blank-canvas-customizer-style', get_stylesheet_directory_uri() . '/assets/customizer.css', array(), wp_get_theme()->get( 'Version' ) );
-}
-add_action( 'customize_controls_enqueue_scripts', 'blank_canvas_customizer_enqueue' );
-
 /**
  * Customizer additions.
  */

blank-canvas/inc/block-patterns.php

@@ -40,16 +40,16 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 					'content'    => '<!-- wp:spacer {"height":20} -->
 									<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
 									<!-- /wp:spacer -->
-									<!-- wp:media-text {"mediaPosition":"right","mediaId":1752,"mediaLink":"' . get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg","mediaType":"image","imageFill":true} -->
-									<div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(' . get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg);background-position:50% 50%"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg" alt="' . __( 'A photo of a tattooed hand, giving the "I love you" sign.', 'blank-canvas' ) . '" class="wp-image-1752 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"32px"}}} -->
-									<h1 class="alignwide" style="font-size:32px"><strong>' . __( 'Hi! I’m a tattooist based in Florida City.', 'blank-canvas' ) . '</strong></h1>
+									<!-- wp:media-text {"mediaPosition":"right","mediaId":1752,"mediaLink":"' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg' ) . '","mediaType":"image","imageFill":true} -->
+									<div class="wp-block-media-text alignwide has-media-on-the-right is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg' ) . ');background-position:50% 50%"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-tattoo.jpg' ) . '" alt="' . esc_attr__( 'A photo of a tattooed hand, giving the "I love you" sign.', 'blank-canvas' ) . '" class="wp-image-1752 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"fontSize":"32px"}}} -->
+									<h1 class="alignwide" style="font-size:32px"><strong>' . esc_html__( 'Hi! I’m a tattooist based in Florida City.', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 									<!-- wp:paragraph -->
-									<p>' . __( 'Specializing in fine line tattoos with a single needle. With over 10 years of experience, I can make your tattoo dreams come true.', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Specializing in fine line tattoos with a single needle. With over 10 years of experience, I can make your tattoo dreams come true.', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 									<!-- wp:buttons -->
 									<div class="wp-block-buttons"><!-- wp:button {"style":{"color":{"background":"#d35069"}},"textColor":"background"} -->
-									<div class="wp-block-button"><a class="wp-block-button__link has-background-color has-text-color has-background" style="background-color:#d35069">' . __( 'Get in touch', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button"><a class="wp-block-button__link has-background-color has-text-color has-background" style="background-color:#d35069">' . esc_html__( 'Get in touch', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons -->
 									<!-- wp:social-links {"className":"is-style-default"} -->
@@ -73,10 +73,10 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
 									<!-- /wp:spacer -->
 									<!-- wp:image {"align":"center","id":20,"width":98,"height":95,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-hat.jpg" alt="' . __( 'Photo of a man wearing a hat.', 'blank-canvas' ) . '" class="wp-image-20" width="98" height="95"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-hat.jpg' ) . '" alt="' . esc_attr__( 'Photo of a man wearing a hat.', 'blank-canvas' ) . '" class="wp-image-20" width="98" height="95"/></figure></div>
 									<!-- /wp:image -->
 									<!-- wp:heading {"textAlign":"center","level":1,"style":{"typography":{"fontSize":"32px"}}} -->
-									<h1 class="has-text-align-center" style="font-size:32px"><strong>' . __( 'Alex Fredrickson', 'blank-canvas' ) . '</strong></h1>
+									<h1 class="has-text-align-center" style="font-size:32px"><strong>'. esc_html__( 'Alex Fredrickson', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 									<!-- wp:social-links {"align":"center","className":"is-style-default"} -->
 									<ul class="wp-block-social-links aligncenter is-style-default"><!-- wp:social-link {"url":"https://linkedin.com/","service":"linkedin"} /-->
@@ -84,27 +84,27 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- wp:social-link {"url":"https://instagram.com/","service":"instagram"} /--></ul>
 									<!-- /wp:social-links -->
 									<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"20px","lineHeight":"1.65"}}} -->
-									<p class="has-text-align-center" style="font-size:20px;line-height:1.65">' . __( 'My latest and greatest tips, resources, and reads.<br>So much goodness all in one place!', 'blank-canvas' ) . '</p>
+									<p class="has-text-align-center" style="font-size:20px;line-height:1.65">' . esc_html__( 'My latest and greatest tips, resources, and reads.', 'blank-canvas' ) . '<br />' . esc_html__( 'So much goodness all in one place!', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 									<!-- wp:buttons {"contentJustification":"center"} -->
 									<div class="wp-block-buttons is-content-justification-center"><!-- wp:button {"borderRadius":"","width":100,"className":"is-style-fill"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . __( 'Must read: The Place That Made Me', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . esc_html__( 'Must read: The Place That Made Me', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . __( 'Rain Journal by Richard Johnson', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . esc_html__( 'Rain Journal by Richard Johnson', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . __( '10th Day of Rain', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . esc_html__( '10th Day of Rain', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . __( 'Blurring the Lines Between Architecture and Nature', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . esc_html__( 'Blurring the Lines Between Architecture and Nature', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"width":100,"className":"is-style-fill"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . __( 'Instant Classic: A story of Persistence', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100 is-style-fill"><a class="wp-block-button__link">' . esc_html__( 'Instant Classic: A story of Persistence', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons -->',
 				)
@@ -115,22 +115,22 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 				array(
 					'title'      => __( 'Invitation', 'blank-canvas' ),
 					'categories' => array( 'blank-canvas' ),
-					'content'    => '<!-- wp:media-text {"mediaId":2207,"mediaLink":"' . get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg","mediaType":"image","verticalAlignment":"center","imageFill":true,"style":{"color":{"background":"#f5fff4"}}} -->
-									<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill has-background" style="background-color:#f5fff4"><figure class="wp-block-media-text__media" style="background-image:url(' . get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg);background-position:50% 50%"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg" alt="Photo of two drinks." class="wp-image-2207 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:spacer {"height":30} -->
+					'content'    => '<!-- wp:media-text {"mediaId":2207,"mediaLink":"' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg' ) . '","mediaType":"image","verticalAlignment":"center","imageFill":true,"style":{"color":{"background":"#f5fff4"}}} -->
+									<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-center is-image-fill has-background" style="background-color:#f5fff4"><figure class="wp-block-media-text__media" style="background-image:url(' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg' ) . ');background-position:50% 50%"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-drink.jpg' ) . '" alt="' . esc_attr__( 'Photo of two drinks.', 'blank-canvas' ) . '" class="wp-image-2207 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:spacer {"height":30} -->
 									<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
 									<!-- /wp:spacer -->
 									<!-- wp:heading {"level":1,"style":{"color":{"text":"#c61aa7"}}} -->
-									<h1 class="has-text-color" style="color:#c61aa7"><strong>' . __( 'You&rsquo;re Invited', 'blank-canvas' ) . '</strong></h1>
+									<h1 class="has-text-color" style="color:#c61aa7"><strong>' . esc_html__( 'You&rsquo;re Invited', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 									<!-- wp:columns -->
 									<div class="wp-block-columns"><!-- wp:column -->
 									<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
-									<p class="has-small-font-size">' . __( 'Pier 38<br>San Francisco, CA', 'blank-canvas' ) . '</p>
+									<p class="has-small-font-size">' . esc_html__( 'Pier 38', 'blank-canvas' ) . '<br />' . esc_html__( 'San Francisco, CA', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column -->
 									<!-- wp:column -->
 									<div class="wp-block-column"><!-- wp:paragraph {"fontSize":"small"} -->
-									<p class="has-small-font-size">' . __( '8pm–12am<br>April 16th', 'blank-canvas' ) . '</p>
+									<p class="has-small-font-size">' . esc_html__( '8pm–12am', 'blank-canvas' ) . '<br />' . esc_html__( 'April 16th', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column --></div>
 									<!-- /wp:columns -->
@@ -138,11 +138,11 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<hr class="wp-block-separator has-text-color has-background is-style-wide" style="background-color:#e343cd;color:#e343cd"/>
 									<!-- /wp:separator -->
 									<!-- wp:paragraph -->
-									<p>' . __( 'Join us for a celebratory party featuring creative cocktails and mocktails, seasonal chef-crafted snacks and appetizers, and a range of desserts and pastries from local bakeries.', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Join us for a celebratory party featuring creative cocktails and mocktails, seasonal chef-crafted snacks and appetizers, and a range of desserts and pastries from local bakeries.', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 									<!-- wp:buttons -->
 									<div class="wp-block-buttons"><!-- wp:button {"style":{"color":{"background":"#c61aa7"}},"textColor":"background","className":"is-style-fill"} -->
-									<div class="wp-block-button is-style-fill"><a class="wp-block-button__link has-background-color has-text-color has-background" style="background-color:#c61aa7">' . __( 'RSVP', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button is-style-fill"><a class="wp-block-button__link has-background-color has-text-color has-background" style="background-color:#c61aa7">' . esc_html__( 'RSVP', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons -->
 									<!-- wp:spacer {"height":30} -->
@@ -157,18 +157,18 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 				array(
 					'title'      => __( 'Split Screen', 'blank-canvas' ),
 					'categories' => array( 'blank-canvas' ),
-					'content'    => '<!-- wp:media-text {"align":"full","mediaId":598,"mediaLink":"' . get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg","mediaType":"image","imageFill":true} -->
-									<div class="wp-block-media-text alignfull is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(' . get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg);background-position:50% 50%"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg" alt="' . __( 'Photo of a vintage camera.', 'blank-canvas' ) . '" class="wp-image-598 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:cover {"overlayColor":"background","minHeight":95,"minHeightUnit":"vh"} -->
+					'content'    => '<!-- wp:media-text {"align":"full","mediaId":598,"mediaLink":"' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg' ) . '","mediaType":"image","imageFill":true} -->
+									<div class="wp-block-media-text alignfull is-stacked-on-mobile is-image-fill"><figure class="wp-block-media-text__media" style="background-image:url(' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg' ) . ');background-position:50% 50%"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-camera.jpg' ) . '" alt="' . esc_attr__( 'Photo of a vintage camera.', 'blank-canvas' ) . '" class="wp-image-598 size-full"/></figure><div class="wp-block-media-text__content"><!-- wp:cover {"overlayColor":"background","minHeight":95,"minHeightUnit":"vh"} -->
 									<div class="wp-block-cover has-background-background-color has-background-dim" style="min-height:95vh"><div class="wp-block-cover__inner-container"><!-- wp:image {"align":"center","id":624,"width":200,"height":200,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-woman.jpg" alt="' . __( 'Photo of a woman.', 'blank-canvas' ) . '" class="wp-image-624" width="200" height="200"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-woman.jpg' ) . '" alt="' . esc_attr__( 'Photo of a woman.', 'blank-canvas' ) . '" class="wp-image-624" width="200" height="200"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:heading {"textAlign":"center","level":1} -->
-									<h1 class="has-text-align-center"><strong>' . __( 'Jasmine Baker', 'blank-canvas' ) . '</strong></h1>
+									<h1 class="has-text-align-center"><strong>'. esc_html__( 'Jasmine Baker', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 
 									<!-- wp:paragraph {"align":"center","backgroundColor":"background"} -->
-									<p class="has-text-align-center has-background-background-color has-background">' . __( 'Hello! I am a photographer and designer living near Portland, Maine. When I am not posting to Instagram, you can find me shooting weddings and portraits.', 'blank-canvas' ) . '</p>
+									<p class="has-text-align-center has-background-background-color has-background">' . esc_html__( 'Hello! I am a photographer and designer living near Portland, Maine. When I am not posting to Instagram, you can find me shooting weddings and portraits.', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:social-links {"align":"center","className":"is-style-default"} -->
@@ -196,11 +196,11 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- /wp:spacer -->
 
 									<!-- wp:image {"align":"center","id":36,"width":96,"height":96,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-links-hamburger.png" alt="' . __( 'Hamburger icon', 'blank-canvas' ) . '" class="wp-image-36" width="96" height="96"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-hamburger.png' ) . '" alt="' . esc_attr__( 'Hamburger icon', 'blank-canvas' ) . '" class="wp-image-36" width="96" height="96"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:heading {"textAlign":"center","level":1} -->
-									<h1 class="has-text-align-center"><strong>' . __( 'Hamburger', 'blank-canvas' ) . '</strong></h1>
+									<h1 class="has-text-align-center"><strong>' . esc_html__( 'Hamburger', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 
 									<!-- wp:spacer {"height":1} -->
@@ -209,23 +209,23 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 
 									<!-- wp:buttons -->
 									<div class="wp-block-buttons"><!-- wp:button {"borderRadius":50,"backgroundColor":"background","textColor":"foreground","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">📺  ' . __( 'Subscribe on YouTube', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">📺  ' . esc_html__( 'Subscribe on YouTube', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":50,"backgroundColor":"background","textColor":"foreground","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px"> 🎹  ' . __( 'Listen on SoundCloud', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px"> 🎹  ' . esc_html__( 'Listen on SoundCloud', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":50,"backgroundColor":"background","textColor":"foreground","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">📸  ' . __( 'Follow my Instagram', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">📸  ' . esc_html__( 'Follow my Instagram', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":50,"backgroundColor":"background","textColor":"foreground","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">🛍  ' . __( 'Shop my style picks', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">🛍  ' . esc_html__( 'Shop my style picks', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":50,"backgroundColor":"background","textColor":"foreground","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">🙋‍♀️  ' . __( 'Ask me a question', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-foreground-color has-background-background-color has-text-color has-background" style="border-radius:50px">🙋‍♀️  ' . esc_html__( 'Ask me a question', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons -->
 
@@ -243,32 +243,32 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 					'categories' => array( 'link-in-bio' ),
 					'content'    => '<!-- wp:cover {"overlayColor":"background","minHeight":1090,"minHeightUnit":"px","align":"full"} -->
 									<div class="wp-block-cover alignfull has-background-background-color has-background-dim" style="min-height:1090px"><div class="wp-block-cover__inner-container"><!-- wp:image {"align":"center","id":130,"width":96,"height":96,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-links-pencils.jpg" alt="' . __( 'Colored pencils', 'blank-canvas' ) . '" class="wp-image-130" width="96" height="96"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-pencils.jpg' ) . '" alt="' . esc_attr__( 'Colored pencils', 'blank-canvas' ) . '" class="wp-image-130" width="96" height="96"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:heading {"textAlign":"center"} -->
-									<h2 class="has-text-align-center"><strong>' . __( 'Antonio Miller', 'blank-canvas' ) . '</strong></h2>
+									<h2 class="has-text-align-center"><strong>' . esc_html__( 'Antonio Miller', 'blank-canvas' ) . '</strong></h2>
 									<!-- /wp:heading -->
 
 									<!-- wp:buttons -->
 									<div class="wp-block-buttons"><!-- wp:button {"borderRadius":10,"style":{"color":{"gradient":"linear-gradient(135deg,rgb(11,192,224) 0%,rgb(128,208,199) 100%)"}},"width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(11,192,224) 0%,rgb(128,208,199) 100%)">' . __( 'Watch my tutorials', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(11,192,224) 0%,rgb(128,208,199) 100%)">' . esc_html__( 'Watch my tutorials', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":10,"style":{"color":{"gradient":"linear-gradient(135deg,rgb(65,88,208) 0%,rgb(200,80,192) 100%)"}},"width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(65,88,208) 0%,rgb(200,80,192) 100%)">' . __( 'Buy prints of my work', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(65,88,208) 0%,rgb(200,80,192) 100%)">' . esc_html__( 'Buy prints of my work', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":10,"style":{"color":{"gradient":"linear-gradient(135deg,rgb(174,61,255) 0%,rgb(226,39,86) 100%)"}},"width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(174,61,255) 0%,rgb(226,39,86) 100%)">' . __( 'My wish list', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(174,61,255) 0%,rgb(226,39,86) 100%)">' . esc_html__( 'My wish list', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":10,"style":{"color":{"gradient":"linear-gradient(135deg,rgb(224,44,44) 0%,rgb(249,197,57) 100%)"}},"width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(224,44,44) 0%,rgb(249,197,57) 100%)">' . __( 'Instagram', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(224,44,44) 0%,rgb(249,197,57) 100%)">' . esc_html__( 'Instagram', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"borderRadius":10,"style":{"color":{"gradient":"linear-gradient(135deg,rgb(0,173,121) 0%,rgb(41,182,229) 100%)"}},"width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(0,173,121) 0%,rgb(41,182,229) 100%)">' . __( 'Twitter', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-background" style="border-radius:10px;background:linear-gradient(135deg,rgb(0,173,121) 0%,rgb(41,182,229) 100%)">' . esc_html__( 'Twitter', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons --></div></div>
 									<!-- /wp:cover -->',
@@ -280,48 +280,44 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 				array(
 					'title'      => __( 'Musician Links', 'blank-canvas' ),
 					'categories' => array( 'link-in-bio' ),
-					'content'    => '<!-- wp:cover {"url":"' . get_stylesheet_directory_uri() . '/assets/pattern-links-gradient.jpg","id":181,"hasParallax":true,"dimRatio":0,"overlayColor":"primary","minHeight":100,"minHeightUnit":"vh","align":"full"} -->
-									<div class="wp-block-cover alignfull has-primary-background-color has-parallax" style="background-image:url(' . get_stylesheet_directory_uri() . '/assets/pattern-links-gradient.jpg);min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:spacer {"height":10} -->
+					'content'    => '<!-- wp:cover {"url":"' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-gradient.jpg' ) . '","id":181,"hasParallax":true,"dimRatio":0,"overlayColor":"primary","minHeight":100,"minHeightUnit":"vh","align":"full"} -->
+									<div class="wp-block-cover alignfull has-primary-background-color has-parallax" style="background-image:url(' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-gradient.jpg' ) . ');min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:spacer {"height":10} -->
 									<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
 									<!-- /wp:spacer -->
 
 									<!-- wp:image {"align":"center","id":30,"width":120,"height":120,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-links-singer.png" alt="' . __( 'Image of a singer performing.', 'blank-canvas' ) . '" class="wp-image-30" width="120" height="120"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-singer.png' ) . '" alt="' . esc_attr__( 'Image of a singer performing.', 'blank-canvas' ) . '" class="wp-image-30" width="120" height="120"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:heading {"textAlign":"center","level":1,"fontSize":"huge"} -->
-									<h1 class="has-text-align-center has-huge-font-size"><strong>' . __( 'Alex Smith — Own Way', 'blank-canvas' ) . '</strong></h1>
+									<h1 class="has-text-align-center has-huge-font-size"><strong>' . esc_html__( 'Alex Smith — Own Way', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 
-									<!-- wp:embed {"url":"https://www.youtube.com/watch?v=_qX8CYToBbQ","type":"rich","providerNameSlug":"youtube","responsive":true,"className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
-									<figure class="wp-block-embed is-type-rich is-provider-youtube wp-block-embed-youtube wp-embed-aspect-16-9 wp-has-aspect-ratio"><div class="wp-block-embed__wrapper">
-									https://www.youtube.com/watch?v=_qX8CYToBbQ
-									</div></figure>
-									<!-- /wp:embed -->
+									<!-- wp:embed {"providerNameSlug":"youtube","responsive":true} /-->
 
 									<!-- wp:buttons -->
 									<div class="wp-block-buttons"><!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'SoundCloud', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'SoundCloud', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'Spotify', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'Spotify', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'Bandcamp', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'Bandcamp', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'Apple Music', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'Apple Music', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'YouTube', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'YouTube', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button -->
 
 									<!-- wp:button {"textColor":"background","width":50,"className":"is-style-outline"} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . __( 'Tidal', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-50 is-style-outline"><a class="wp-block-button__link has-background-color has-text-color">' . esc_html__( 'Tidal', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons -->
 
@@ -347,11 +343,11 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 					'categories' => array( 'link-in-bio' ),
 					'content'    => '<!-- wp:cover {"overlayColor":"background","minHeight":100,"minHeightUnit":"vh","align":"full"} -->
 									<div class="wp-block-cover alignfull has-background-background-color has-background-dim" style="min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:image {"align":"center","id":57,"width":150,"height":150,"sizeSlug":"large","linkDestination":"none","className":"is-style-rounded"} -->
-									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-links-sunglasses.jpg" alt="' . __( 'Woman wearing sunglasses', 'blank-canvas' ) . '" class="wp-image-57" width="150" height="150"/></figure></div>
+									<div class="wp-block-image is-style-rounded"><figure class="aligncenter size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-sunglasses.jpg' ) . '" alt="' . esc_attr__( 'Woman wearing sunglasses', 'blank-canvas' ) . '" class="wp-image-57" width="150" height="150"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:heading {"textAlign":"center","level":1,"textColor":"primary"} -->
-									<h1 class="has-text-align-center has-primary-color has-text-color"><strong>@juliapaxton</strong></h1>
+									<h1 class="has-text-align-center has-primary-color has-text-color"><strong>' . esc_html__( 'Julia Paxton', 'blank-canvas' ) . '</strong></h1>
 									<!-- /wp:heading -->
 
 									<!-- wp:spacer {"height":1} -->
@@ -365,14 +361,14 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- wp:columns {"verticalAlignment":"center"} -->
 									<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"70%"} -->
 									<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:70%"><!-- wp:paragraph -->
-									<p>' . __( 'Rhinestone Earrings, ASOS', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Rhinestone Earrings, ASOS', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column -->
 
 									<!-- wp:column {"verticalAlignment":"center"} -->
 									<div class="wp-block-column is-vertically-aligned-center"><!-- wp:buttons {"contentJustification":"right"} -->
 									<div class="wp-block-buttons is-content-justification-right"><!-- wp:button {"backgroundColor":"primary","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . __( '$36', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . esc_html__( '$36', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons --></div>
 									<!-- /wp:column --></div>
@@ -385,14 +381,14 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- wp:columns {"verticalAlignment":"center"} -->
 									<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"70%"} -->
 									<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:70%"><!-- wp:paragraph -->
-									<p>' . __( 'Pink Long Sleeve Tea Dress, Topshop', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Pink Long Sleeve Tea Dress, Topshop', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column -->
 
 									<!-- wp:column {"verticalAlignment":"center"} -->
 									<div class="wp-block-column is-vertically-aligned-center"><!-- wp:buttons {"contentJustification":"right"} -->
 									<div class="wp-block-buttons is-content-justification-right"><!-- wp:button {"backgroundColor":"primary","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . __( '$45', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . esc_html__( '$45', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons --></div>
 									<!-- /wp:column --></div>
@@ -405,14 +401,14 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- wp:columns {"verticalAlignment":"center"} -->
 									<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"70%"} -->
 									<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:70%"><!-- wp:paragraph -->
-									<p>' . __( 'Chunky Platform Lace-Up Boots, H&amp;M', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Chunky Platform Lace-Up Boots, H&amp;M', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column -->
 
 									<!-- wp:column {"verticalAlignment":"center"} -->
 									<div class="wp-block-column is-vertically-aligned-center"><!-- wp:buttons {"contentJustification":"right"} -->
 									<div class="wp-block-buttons is-content-justification-right"><!-- wp:button {"backgroundColor":"primary","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . __( '$60', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . esc_html__( '$60', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons --></div>
 									<!-- /wp:column --></div>
@@ -425,14 +421,14 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- wp:columns {"verticalAlignment":"center"} -->
 									<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"70%"} -->
 									<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:70%"><!-- wp:paragraph -->
-									<p>' . __( 'Oversized Alpaca Crew, Everlane', 'blank-canvas' ) . '</p>
+									<p>' . esc_html__( 'Oversized Alpaca Crew, Everlane', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph --></div>
 									<!-- /wp:column -->
 
 									<!-- wp:column {"verticalAlignment":"center"} -->
 									<div class="wp-block-column is-vertically-aligned-center"><!-- wp:buttons {"contentJustification":"right"} -->
 									<div class="wp-block-buttons is-content-justification-right"><!-- wp:button {"backgroundColor":"primary","width":100} -->
-									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . __( '$70', 'blank-canvas' ) . '</a></div>
+									<div class="wp-block-button has-custom-width wp-block-button__width-100"><a class="wp-block-button__link has-primary-background-color has-background">' . esc_html__( '$70', 'blank-canvas' ) . '</a></div>
 									<!-- /wp:button --></div>
 									<!-- /wp:buttons --></div>
 									<!-- /wp:column --></div>
@@ -460,7 +456,7 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 					'categories' => array( 'link-in-bio' ),
 					'content'    => '<!-- wp:cover {"overlayColor":"background","minHeight":100,"minHeightUnit":"vh","align":"full"} -->
 									<div class="wp-block-cover alignfull has-background-background-color has-background-dim" style="min-height:100vh"><div class="wp-block-cover__inner-container"><!-- wp:image {"align":"left","id":100,"width":100,"height":100,"sizeSlug":"large","linkDestination":"none"} -->
-									<div class="wp-block-image"><figure class="alignleft size-large is-resized"><img src="' . get_stylesheet_directory_uri() . '/assets/pattern-links-logo.png" alt="' . __( 'A logo of a circle with a line through it.', 'blank-canvas' ) . '" class="wp-image-100" width="100" height="100"/></figure></div>
+									<div class="wp-block-image"><figure class="alignleft size-large is-resized"><img src="' . esc_url( get_stylesheet_directory_uri() . '/assets/pattern-links-logo.png' ) . '" alt="' . esc_attr__( 'A logo of a circle with a line through it.', 'blank-canvas' ) . '" class="wp-image-100" width="100" height="100"/></figure></div>
 									<!-- /wp:image -->
 
 									<!-- wp:spacer {"height":1} -->
@@ -468,11 +464,11 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- /wp:spacer -->
 
 									<!-- wp:heading {"textAlign":"left","level":1} -->
-									<h1 class="has-text-align-left">' . __( 'Patricia Jones', 'blank-canvas' ) . '</h1>
+									<h1 class="has-text-align-left">' . esc_html__( 'Patricia Jones', 'blank-canvas' ) . '</h1>
 									<!-- /wp:heading -->
 
 									<!-- wp:paragraph -->
-									<p><em>' . __( 'Published work and ephemera.', 'blank-canvas' ) . '</em></p>
+									<p><em>' . esc_html__( 'Published work and ephemera.', 'blank-canvas' ) . '</em></p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:separator {"customColor":"#959595","className":"is-style-wide"} -->
@@ -480,23 +476,23 @@ if ( ! function_exists( 'blank_canvas_register_block_patterns' ) ) :
 									<!-- /wp:separator -->
 
 									<!-- wp:paragraph -->
-									<p><a href="#">' . __( '“The Lost Tricycle” Book', 'blank-canvas' ) . '</a></p>
+									<p><a href="#">' . esc_html__( '“The Lost Tricycle” Book', 'blank-canvas' ) . '</a></p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:paragraph -->
-									<p><a href="#">' . __( '"Why we must own our history"', 'blank-canvas' ) . '</a>' . __( ' in <em>The Atlantic</em>', 'blank-canvas' ) . '</p>
+									<p><a href="#">' . esc_html__( '"Why we must own our history"', 'blank-canvas' ) . '</a>' . esc_html__( ' in <em>The Atlantic</em>', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:paragraph -->
-									<p><a href="#">' . __( '"Identity and Ownership"', 'blank-canvas' ) . '</a>' . __( ' in <em>The New York Times</em>', 'blank-canvas' ) . '</p>
+									<p><a href="#">' . esc_html__( '"Identity and Ownership"', 'blank-canvas' ) . '</a>' . esc_html__( ' in <em>The New York Times</em>', 'blank-canvas' ) . '</p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:paragraph -->
-									<p><a href="#">' . __( 'Sponsor: Crafty Cookies', 'blank-canvas' ) . '</a></p>
+									<p><a href="#">' . esc_html__( 'Sponsor: Crafty Cookies', 'blank-canvas' ) . '</a></p>
 									<!-- /wp:paragraph -->
 
 									<!-- wp:paragraph -->
-									<p><a href="#">' . __( 'Donate to help keep us posting!', 'blank-canvas' ) . '</a></p>
+									<p><a href="#">' . esc_html__( 'Donate to help keep us posting!', 'blank-canvas' ) . '</a></p>
 									<!-- /wp:paragraph --></div></div>
 									<!-- /wp:cover -->',
 				)

blank-canvas/inc/customizer.php

@@ -63,7 +63,7 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 				'show_site_header',
 				array(
 					'label'       => esc_html__( 'Enable site header and top menu', 'blank-canvas' ),
-					'description' => esc_html__( 'Check to show a standard site header, navigation menu and social links menu on the top of every page.', 'blank-canvas' ),
+					'description' => esc_html__( 'Check to show a standard site header, navigation menu and social links menu on the top of every page. These can be configured in the "Site Identity" and "Menus" panels.', 'blank-canvas' ),
 					'section'     => 'jetpack_content_options',
 					'priority'    => 10,
 					'type'        => 'checkbox',
@@ -134,8 +134,8 @@ if ( ! class_exists( 'Blank_Canvas_Customize' ) ) {
 			$wp_customize->add_control(
 				'show_comments',
 				array(
-					'label'       => esc_html__( 'Enable comments', 'blank-canvas' ),
-					'description' => esc_html__( "Check to show comments underneath each post.", 'blank-canvas' ),
+					'label'       => esc_html__( 'Make comments visible', 'blank-canvas' ),
+					'description' => esc_html__( 'Check to show comments underneath posts and pages. Comments can be configured in your site’s Discussion settings screen.', 'blank-canvas' ),
 					'section'     => 'jetpack_content_options',
 					'priority'    => 10,
 					'type'        => 'checkbox',

blank-canvas/inc/wpcom.php

@@ -15,6 +15,14 @@ function blank_canvas_wpcom_customize_update( $wp_customize ) {
 }
 add_action( 'customize_register', 'blank_canvas_wpcom_customize_update', 11 );
 
+/**
+ * Enqueue CSS for Customizer message.
+ */
+function blank_canvas_customizer_enqueue() {
+	wp_enqueue_style( 'blank-canvas-customizer-style', get_stylesheet_directory_uri() . '/inc/wpcom-customizer.css', array(), wp_get_theme()->get( 'Version' ) );
+}
+add_action( 'customize_controls_enqueue_scripts', 'blank_canvas_customizer_enqueue' );
+
 /**
  * Register WP.com-only block patterns.
  */

blank-canvas/languages/blank-canvas.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the GNU General Public License v2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Blank Canvas 1.1\n"
+"Project-Id-Version: Blank Canvas 1.2.9-wpcom\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/theme/blank-canvas\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2021-02-01T18:56:01+00:00\n"
+"POT-Creation-Date: 2021-02-25T14:20:31+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.4.0\n"
 "X-Domain: blank-canvas\n"
@@ -24,7 +24,7 @@ msgid "https://github.com/Automattic/themes/blank-canvas"
 msgstr ""
 
 #. Description of the theme
-msgid "Blank Canvas is a minimalist theme, designed for single-page websites. Its single post and page layouts have no header, navigation menus, or widgets, so the page you design in the WordPress editor is the same page you’ll see on the front end. The theme’s default styles are conservative, relying on simple sans-serif fonts and a subtle blue highlight color. Blank Canvas is ready for your customizations."
+msgid "Blank Canvas is a minimalist theme, designed for single-page websites. Its single post and page layouts have no header, navigation menus, or widgets by default, so the page you design in the WordPress editor is the same page you’ll see on the front end. The theme’s default styles are conservative, relying on simple sans-serif fonts and a subtle blue highlight color. Blank Canvas is ready for your customizations."
 msgstr ""
 
 #. Author of the theme
@@ -35,174 +35,446 @@ msgstr ""
 msgid "https://automattic.com/"
 msgstr ""
 
-#: functions.php:39
+#: functions.php:40
 msgid "Primary"
 msgstr ""
 
-#: functions.php:44
+#: functions.php:45
 msgid "Secondary"
 msgstr ""
 
-#: functions.php:49
+#: functions.php:50
 msgid "Foreground"
 msgstr ""
 
-#: functions.php:54
+#: functions.php:55
 msgid "Tertiary"
 msgstr ""
 
-#: functions.php:59
+#: functions.php:60
 msgid "Background"
 msgstr ""
 
-#: functions.php:125
-msgid "This theme is designed to hide the site logo, site title, and tagline on all single posts and pages."
+#: functions.php:75
+msgid "Background Color"
+msgstr ""
+
+#: functions.php:76
+msgid "Foreground Color"
+msgstr ""
+
+#: functions.php:77
+msgid "Primary Color"
+msgstr ""
+
+#: functions.php:78
+msgid "Secondary Color"
+msgstr ""
+
+#: functions.php:79
+msgid "Tertiary Color"
+msgstr ""
+
+#: functions.php:133
+msgid "The site logo, title, and tagline will only appear on single posts and pages if the “Site header and top menu\" option is enabled in the Content Options section."
+msgstr ""
+
+#: functions.php:134
+#: functions.php:135
+msgid "This theme will only display Menus if they are enabled in the Content Options section."
+msgstr ""
+
+#: functions.php:136
+msgid "This theme will only display Widgets if they are enabled in the Content Options section."
 msgstr ""
 
 #. translators: %s: Name of current post. Only visible to screen readers.
-#: functions.php:143
+#: functions.php:154
 msgid "Edit <span class=\"screen-reader-text\">%s</span>"
 msgstr ""
 
-#: inc/block-patterns.php:33
+#: inc/block-patterns.php:26
+msgid "Link in Bio"
+msgstr ""
+
+#: inc/block-patterns.php:38
 msgid "About Me"
 msgstr ""
 
-#: inc/block-patterns.php:39
+#: inc/block-patterns.php:44
 msgid "A photo of a tattooed hand, giving the \"I love you\" sign."
 msgstr ""
 
-#: inc/block-patterns.php:40
+#: inc/block-patterns.php:45
 msgid "Hi! I’m a tattooist based in Florida City."
 msgstr ""
 
-#: inc/block-patterns.php:43
+#: inc/block-patterns.php:48
 msgid "Specializing in fine line tattoos with a single needle. With over 10 years of experience, I can make your tattoo dreams come true."
 msgstr ""
 
-#: inc/block-patterns.php:47
-#: inc/wpcom.php:49
+#: inc/block-patterns.php:52
+#: inc/wpcom.php:57
 msgid "Get in touch"
 msgstr ""
 
-#: inc/block-patterns.php:65
+#: inc/block-patterns.php:70
 msgid "Links"
 msgstr ""
 
-#: inc/block-patterns.php:71
+#: inc/block-patterns.php:76
 msgid "Photo of a man wearing a hat."
 msgstr ""
 
-#: inc/block-patterns.php:74
+#: inc/block-patterns.php:79
 msgid "Alex Fredrickson"
 msgstr ""
 
-#: inc/block-patterns.php:82
-msgid "My latest and greatest tips, resources, and reads.<br>So much goodness all in one place!"
+#: inc/block-patterns.php:87
+msgid "My latest and greatest tips, resources, and reads."
+msgstr ""
+
+#: inc/block-patterns.php:87
+msgid "So much goodness all in one place!"
 msgstr ""
 
-#: inc/block-patterns.php:86
+#: inc/block-patterns.php:91
 msgid "Must read: The Place That Made Me"
 msgstr ""
 
-#: inc/block-patterns.php:90
+#: inc/block-patterns.php:95
 msgid "Rain Journal by Richard Johnson"
 msgstr ""
 
-#: inc/block-patterns.php:94
+#: inc/block-patterns.php:99
 msgid "10th Day of Rain"
 msgstr ""
 
-#: inc/block-patterns.php:98
+#: inc/block-patterns.php:103
 msgid "Blurring the Lines Between Architecture and Nature"
 msgstr ""
 
-#: inc/block-patterns.php:102
+#: inc/block-patterns.php:107
 msgid "Instant Classic: A story of Persistence"
 msgstr ""
 
-#: inc/block-patterns.php:111
+#: inc/block-patterns.php:116
 msgid "Invitation"
 msgstr ""
 
-#: inc/block-patterns.php:118
-msgid "You&rsquo;re Invited"
+#: inc/block-patterns.php:119
+msgid "Photo of two drinks."
 msgstr ""
 
 #: inc/block-patterns.php:123
-msgid "Pier 38<br>San Francisco, CA"
+msgid "You&rsquo;re Invited"
+msgstr ""
+
+#: inc/block-patterns.php:128
+msgid "Pier 38"
 msgstr ""
 
 #: inc/block-patterns.php:128
-msgid "8pm–12am<br>April 16th"
+msgid "San Francisco, CA"
+msgstr ""
+
+#: inc/block-patterns.php:133
+msgid "8pm–12am"
+msgstr ""
+
+#: inc/block-patterns.php:133
+msgid "April 16th"
 msgstr ""
 
-#: inc/block-patterns.php:136
+#: inc/block-patterns.php:141
 msgid "Join us for a celebratory party featuring creative cocktails and mocktails, seasonal chef-crafted snacks and appetizers, and a range of desserts and pastries from local bakeries."
 msgstr ""
 
-#: inc/block-patterns.php:140
+#: inc/block-patterns.php:145
 msgid "RSVP"
 msgstr ""
 
-#: inc/block-patterns.php:153
+#: inc/block-patterns.php:158
 msgid "Split Screen"
 msgstr ""
 
-#: inc/block-patterns.php:156
+#: inc/block-patterns.php:161
 msgid "Photo of a vintage camera."
 msgstr ""
 
-#: inc/block-patterns.php:158
+#: inc/block-patterns.php:163
 msgid "Photo of a woman."
 msgstr ""
 
-#: inc/block-patterns.php:162
+#: inc/block-patterns.php:167
 msgid "Jasmine Baker"
 msgstr ""
 
-#: inc/block-patterns.php:166
+#: inc/block-patterns.php:171
 msgid "Hello! I am a photographer and designer living near Portland, Maine. When I am not posting to Instagram, you can find me shooting weddings and portraits."
 msgstr ""
 
-#: inc/wpcom.php:30
+#: inc/block-patterns.php:191
+msgid "Emoji Links"
+msgstr ""
+
+#: inc/block-patterns.php:199
+msgid "Hamburger icon"
+msgstr ""
+
+#: inc/block-patterns.php:203
+msgid "Hamburger"
+msgstr ""
+
+#: inc/block-patterns.php:212
+msgid "Subscribe on YouTube"
+msgstr ""
+
+#: inc/block-patterns.php:216
+msgid "Listen on SoundCloud"
+msgstr ""
+
+#: inc/block-patterns.php:220
+msgid "Follow my Instagram"
+msgstr ""
+
+#: inc/block-patterns.php:224
+msgid "Shop my style picks"
+msgstr ""
+
+#: inc/block-patterns.php:228
+msgid "Ask me a question"
+msgstr ""
+
+#: inc/block-patterns.php:242
+msgid "Gradient Links"
+msgstr ""
+
+#: inc/block-patterns.php:246
+msgid "Colored pencils"
+msgstr ""
+
+#: inc/block-patterns.php:250
+msgid "Antonio Miller"
+msgstr ""
+
+#: inc/block-patterns.php:255
+msgid "Watch my tutorials"
+msgstr ""
+
+#: inc/block-patterns.php:259
+msgid "Buy prints of my work"
+msgstr ""
+
+#: inc/block-patterns.php:263
+msgid "My wish list"
+msgstr ""
+
+#: inc/block-patterns.php:267
+msgid "Instagram"
+msgstr ""
+
+#: inc/block-patterns.php:271
+msgid "Twitter"
+msgstr ""
+
+#: inc/block-patterns.php:281
+msgid "Musician Links"
+msgstr ""
+
+#: inc/block-patterns.php:289
+msgid "Image of a singer performing."
+msgstr ""
+
+#: inc/block-patterns.php:293
+msgid "Alex Smith — Own Way"
+msgstr ""
+
+#: inc/block-patterns.php:304
+msgid "SoundCloud"
+msgstr ""
+
+#: inc/block-patterns.php:308
+msgid "Spotify"
+msgstr ""
+
+#: inc/block-patterns.php:312
+msgid "Bandcamp"
+msgstr ""
+
+#: inc/block-patterns.php:316
+msgid "Apple Music"
+msgstr ""
+
+#: inc/block-patterns.php:320
+msgid "YouTube"
+msgstr ""
+
+#: inc/block-patterns.php:324
+msgid "Tidal"
+msgstr ""
+
+#: inc/block-patterns.php:346
+msgid "Product Links"
+msgstr ""
+
+#: inc/block-patterns.php:350
+msgid "Woman wearing sunglasses"
+msgstr ""
+
+#: inc/block-patterns.php:354
+msgid "Julia Paxton"
+msgstr ""
+
+#: inc/block-patterns.php:368
+msgid "Rhinestone Earrings, ASOS"
+msgstr ""
+
+#: inc/block-patterns.php:375
+msgid "$36"
+msgstr ""
+
+#: inc/block-patterns.php:388
+msgid "Pink Long Sleeve Tea Dress, Topshop"
+msgstr ""
+
+#: inc/block-patterns.php:395
+msgid "$45"
+msgstr ""
+
+#: inc/block-patterns.php:408
+msgid "Chunky Platform Lace-Up Boots, H&amp;M"
+msgstr ""
+
+#: inc/block-patterns.php:415
+msgid "$60"
+msgstr ""
+
+#: inc/block-patterns.php:428
+msgid "Oversized Alpaca Crew, Everlane"
+msgstr ""
+
+#: inc/block-patterns.php:435
+msgid "$70"
+msgstr ""
+
+#: inc/block-patterns.php:459
+msgid "Text Links"
+msgstr ""
+
+#: inc/block-patterns.php:463
+msgid "A logo of a circle with a line through it."
+msgstr ""
+
+#: inc/block-patterns.php:471
+msgid "Patricia Jones"
+msgstr ""
+
+#: inc/block-patterns.php:475
+msgid "Published work and ephemera."
+msgstr ""
+
+#: inc/block-patterns.php:483
+msgid "“The Lost Tricycle” Book"
+msgstr ""
+
+#: inc/block-patterns.php:487
+msgid "\"Why we must own our history\""
+msgstr ""
+
+#: inc/block-patterns.php:487
+msgid " in <em>The Atlantic</em>"
+msgstr ""
+
+#: inc/block-patterns.php:491
+msgid "\"Identity and Ownership\""
+msgstr ""
+
+#: inc/block-patterns.php:491
+msgid " in <em>The New York Times</em>"
+msgstr ""
+
+#: inc/block-patterns.php:495
+msgid "Sponsor: Crafty Cookies"
+msgstr ""
+
+#: inc/block-patterns.php:499
+msgid "Donate to help keep us posting!"
+msgstr ""
+
+#: inc/customizer.php:45
+msgid "Content Options"
+msgstr ""
+
+#: inc/customizer.php:65
+msgid "Enable site header and top menu"
+msgstr ""
+
+#: inc/customizer.php:66
+msgid "Check to show a standard site header, navigation menu and social links menu on the top of every page. These can be configured in the \"Site Identity\" and \"Menus\" panels."
+msgstr ""
+
+#: inc/customizer.php:89
+msgid "Enable widgets and footer menu"
+msgstr ""
+
+#: inc/customizer.php:90
+msgid "Check to show a navigation menu and widgets in your site's footer area."
+msgstr ""
+
+#: inc/customizer.php:113
+msgid "Show post and page titles"
+msgstr ""
+
+#: inc/customizer.php:114
+msgid "Check to show titles at the top of single posts and pages."
+msgstr ""
+
+#: inc/customizer.php:137
+msgid "Make comments visible"
+msgstr ""
+
+#: inc/customizer.php:138
+msgid "Check to show comments underneath posts and pages. Comments can be configured in your site’s Discussion settings screen."
+msgstr ""
+
+#: inc/wpcom.php:38
 msgid "Card"
 msgstr ""
 
-#: inc/wpcom.php:35
+#: inc/wpcom.php:43
 msgid "Portrait of a woman against a pink and blue background."
 msgstr ""
 
-#: inc/wpcom.php:40
-msgid "Kate Pollard"
+#: inc/wpcom.php:48
+msgid "Kate Adams"
 msgstr ""
 
-#: inc/wpcom.php:44
+#: inc/wpcom.php:52
 msgid "Hi! I’m a lead strategist for growing sustainable revenue streams for integrated fundraising."
 msgstr ""
 
-#: inc/wpcom.php:70
+#: inc/wpcom.php:78
 msgid "Email Signup"
 msgstr ""
 
-#: inc/wpcom.php:84
+#: inc/wpcom.php:92
 msgid "Virtual Art Classes"
 msgstr ""
 
-#: inc/wpcom.php:88
+#: inc/wpcom.php:96
 msgid "Join instructor Jaime Adams for a series of virtual classes aimed at helping you hone your drawing skills. We will focus on composition, perspective, contour, representing volume, and more!"
 msgstr ""
 
-#: inc/wpcom.php:94
+#: inc/wpcom.php:102
 msgid "Learn More"
 msgstr ""
 
 #. translators: %s: Name of current post. Only visible to screen readers
-#: template-parts/content/content-singular.php:23
+#: template-parts/content/content-singular.php:35
 msgid "Continue reading<span class=\"screen-reader-text\"> \"%s\"</span>"
 msgstr ""
 
-#: template-parts/content/content-singular.php:36
+#: template-parts/content/content-singular.php:48
 msgid "Pages:"
 msgstr ""
-

blank-canvas/page.php

@@ -20,6 +20,13 @@ get_header();
 				the_post();
 
 				get_template_part( 'template-parts/content/content-singular' );
+				
+				if ( true === get_theme_mod( 'show_comments', false ) ) :
+					// If comments are open or we have at least one comment, load up the comment template.
+					if ( comments_open() || get_comments_number() ) {
+						comments_template();
+					}
+				endif; 
 
 			endwhile; // End of the loop.
 			?>

blank-canvas/readme.txt

@@ -16,6 +16,13 @@ The theme’s default styles are conservative, relying on simple sans-serif font
 
 == Changelog ==
 
+= 1.2.9 =
+* Code cleanup.
+
+= 1.2.4 =
+* Add additional block patterns.
+* Tidy up footer spacing. 
+
 = 1.2 =
 * Adds Customizer options for showing page titles, a global header, menu, and widgets. 
 

blank-canvas/style.css

@@ -1,15 +1,15 @@
 /*
 Theme Name: Blank Canvas
-Theme URI: https://github.com/Automattic/themes/blank-canvas
+Theme URI: https://wordpress.com/theme/blank-canvas
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Blank Canvas is a minimalist theme, designed for single-page websites. Its single post and page layouts have no header, navigation menus, or widgets by default, so the page you design in the WordPress editor is the same page you’ll see on the front end. The theme’s default styles are conservative, relying on simple sans-serif fonts and a subtle blue highlight color. Blank Canvas is ready for your customizations.
 Requires at least: 4.9.6
 Tested up to: 5.6
 Requires PHP: 5.6.2
-Version: 1.2.3
+Version: 1.2.9-wpcom
 License: GNU General Public License v2 or later
-License URI: LICENSE
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: seedlet
 Text Domain: blank-canvas
 Tags: one-column, accessibility-ready, custom-colors, editor-style, featured-images, rtl-language-support, sticky-post, translation-ready, auto-loading-homepage

brompton/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "brompton",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

brompton/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brompton",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Brompton",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

brompton/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

brompton/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #252E36;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: #E8E4DD;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: #E8E4DD;
 	background-color: #C04239;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

brompton/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #252E36;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #C04239;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

brompton/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #252E36;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #C04239;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #E8E4DD;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

coutoire/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coutoire",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

coutoire/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coutoire",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Coutoire",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

coutoire/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #FF7A5C;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: #FFFFFF;
@@ -482,14 +483,8 @@ input[type="submit"],
 	padding: 11.6px 11.6px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -497,34 +492,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: #FFFFFF;
 	background-color: #FF7A5C;
@@ -593,6 +573,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

coutoire/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -684,6 +684,10 @@ a:hover {
 	color: #FF7A5C;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1445,6 +1449,11 @@ button[data-load-more-btn], .button {
 	color: #FF7A5C;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

coutoire/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -684,6 +684,10 @@ a:hover {
 	color: #FF7A5C;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1445,6 +1449,11 @@ button[data-load-more-btn], .button {
 	color: #FF7A5C;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

dalston/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dalston",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

dalston/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dalston",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Dalston",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

dalston/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.8
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

dalston/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #005177;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: #FFFFFF;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: #FFFFFF;
 	background-color: #005177;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

dalston/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.8
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -685,6 +685,10 @@ a:hover {
 	color: #005177;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1447,6 +1451,11 @@ button[data-load-more-btn], .button {
 	color: #005177;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

dalston/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.8
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -685,6 +685,10 @@ a:hover {
 	color: #005177;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1447,6 +1451,11 @@ button[data-load-more-btn], .button {
 	color: #005177;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

exford/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "exford",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

exford/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exford",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Exford",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

exford/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

exford/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #195f2b;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
 	color: white;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: white;
 	background-color: #195f2b;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;
@@ -1711,8 +1696,6 @@ pre.wp-block-verse {
 	width: 100%;
 }
 
-.fse-template-part .main-navigation button,
-.fse-template-part .main-navigation input[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link,
 .fse-template-part .main-navigation .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
@@ -1729,12 +1712,8 @@ pre.wp-block-verse {
 	padding: 16px 16px;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
-.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
-.fse-template-part .main-navigation .wp-block-button__link:after,
+.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -1742,29 +1721,19 @@ pre.wp-block-verse {
 	width: 0;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
 .fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
 .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-.fse-template-part .main-navigation button:not(.has-background):hover,
-.fse-template-part .main-navigation input:not(.has-background):hover[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link:not(.has-background):hover,
-.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation button:focus,
-.fse-template-part .main-navigation input:focus[type="submit"],
-.fse-template-part .main-navigation .wp-block-button__link:focus,
-.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation button.has-focus,
-.fse-template-part .main-navigation input.has-focus[type="submit"],
-.fse-template-part .main-navigation .has-focus.wp-block-button__link,
+.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation .wp-block-button__link:focus,
+.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation .has-focus.wp-block-button__link,
 .fse-template-part .main-navigation .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: white;
 	background-color: #195f2b;

exford/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #195f2b;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #195f2b;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

exford/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online presence as striking and stylish as your business with Exford.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #195f2b;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #195f2b;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

hever/experimental-theme.json

@@ -0,0 +1,9 @@
+{
+	"styles": {
+		"root": {
+			"color": {
+				"link": "var(--wp--preset--color--primary)"
+			}
+		}
+	}
+} 

hever/functions.php

@@ -69,6 +69,9 @@ if ( ! function_exists( 'hever_setup' ) ) :
 		if ( function_exists( 'varia_mobile_nav_on_side_setup' ) ) {
 			varia_mobile_nav_on_side_setup();
 		}
+
+		// Add support for experimental link color via Gutenberg: https://github.com/WordPress/gutenberg/blob/master/docs/designers-developers/developers/themes/theme-support.md
+		add_theme_support( 'experimental-link-color' );
 	}
 endif;
 add_action( 'after_setup_theme', 'hever_setup', 12 );

hever/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "hever",
-  "version": "1.4.5",
+  "version": "1.5.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

hever/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hever",
-  "version": "1.4.5",
+  "version": "1.5.7",
   "description": "Hever",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

hever/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A fully responsive theme, ideal for creating a strong — yet beautiful — online presence for your business.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

hever/style-editor.css

@@ -220,6 +220,10 @@ a:hover {
 	color: var(--wp--preset--color--primary-hover);
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 button,
 a {
 	cursor: pointer;
@@ -491,10 +495,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
 	color: var(--wp--preset--color--background);
@@ -510,14 +511,8 @@ input[type="submit"],
 	padding: 16px 24px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -525,34 +520,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: var(--wp--preset--color--background);
 	background-color: var(--wp--preset--color--primary-hover);
@@ -622,6 +602,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;
@@ -1698,8 +1683,6 @@ pre.wp-block-verse {
 	width: 100%;
 }
 
-.fse-template-part .main-navigation button,
-.fse-template-part .main-navigation input[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link,
 .fse-template-part .main-navigation .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
@@ -1716,12 +1699,8 @@ pre.wp-block-verse {
 	padding: 16px 24px;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
-.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
-.fse-template-part .main-navigation .wp-block-button__link:after,
+.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -1729,29 +1708,19 @@ pre.wp-block-verse {
 	width: 0;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
 .fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
 .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-.fse-template-part .main-navigation button:not(.has-background):hover,
-.fse-template-part .main-navigation input:not(.has-background):hover[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link:not(.has-background):hover,
-.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation button:focus,
-.fse-template-part .main-navigation input:focus[type="submit"],
-.fse-template-part .main-navigation .wp-block-button__link:focus,
-.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation button.has-focus,
-.fse-template-part .main-navigation input.has-focus[type="submit"],
-.fse-template-part .main-navigation .has-focus.wp-block-button__link,
+.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation .wp-block-button__link:focus,
+.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation .has-focus.wp-block-button__link,
 .fse-template-part .main-navigation .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: var(--wp--preset--color--background);
 	background-color: var(--wp--preset--color--primary-hover);

hever/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A fully responsive theme, ideal for creating a strong — yet beautiful — online presence for your business.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -713,6 +713,10 @@ a:hover {
 	color: var(--wp--preset--color--primary-hover);
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1475,6 +1479,11 @@ button[data-load-more-btn], .button {
 	color: var(--wp--preset--color--primary-hover);
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

hever/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A fully responsive theme, ideal for creating a strong — yet beautiful — online presence for your business.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -713,6 +713,10 @@ a:hover {
 	color: var(--wp--preset--color--primary-hover);
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1475,6 +1479,11 @@ button[data-load-more-btn], .button {
 	color: var(--wp--preset--color--primary-hover);
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: var(--wp--preset--color--background);
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

leven/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "leven",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

leven/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leven",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Leven",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

leven/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

leven/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #1285ce;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #f7f7f6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: white;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: white;
 	background-color: #1285ce;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

leven/style-rtl.css

@@ -6,7 +6,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #1285ce;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #f7f7f6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #1285ce;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

leven/style.css

@@ -6,7 +6,7 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: A colorful, typography driven, Gutenberg-ready theme meant to grab the attention of potential customers and market or sell products to them.
 Requires at least: WordPress 4.9.6
-Version: 1.4.5
+Version: 1.4.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #1285ce;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #f7f7f6;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #1285ce;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

libre-2/css/blocks.css

@@ -78,42 +78,6 @@ Description: Used to style Gutenberg Blocks.
 	margin-right: inherit;
 }
 
-/*--------------------------------------------------------------
-2.0 General Block Styles
---------------------------------------------------------------*/
-
-/* Captions */
-
-[class^="wp-block-"] figcaption {
-	color: inherit;
-	font-size: 14px;
-	font-style: italic;
-	position: relative;
-}
-
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
-	text-align: left;
-}
-
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption::after {
-	border-top: 1px solid;
-	clear: both;
-	content: "";
-	display: block;
-	margin-top: .875em;
-	padding-top: .875em;
-	width: 25%;
-}
-
-[class^="wp-block-"].alignfull:not(.wp-block-gallery) figcaption {
-	padding-left: 2vw;
-	padding-right: 2vw;
-}
-
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
-	text-align: right;
-}
-
 /*--------------------------------------------------------------
 3.0 Blocks - Common Blocks
 --------------------------------------------------------------*/
@@ -125,12 +89,6 @@ p.has-drop-cap:not(:focus)::first-letter {
 	margin-top: 0.15em;
 }
 
-/* Gallery */
-
-.wp-block-gallery {
-	margin: 0 0 1.75em;
-}
-
 /* Quote */
 
 .wp-block-quote p,
@@ -418,14 +376,6 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 /* Latest Comments */
-
-.wp-block-latest-comments {
-	margin-left: 0;
-	margin-right: 0;
-	padding-left: 0;
-	padding-right: 0;
-}
-
 .wp-block-latest-comments__comment a {
 	box-shadow: 0 1px 0 0 rgba(0,0,0,0);
 }

libre-2/css/editor-blocks.css

@@ -1,535 +1,22 @@
-/*
-Theme Name: Libre 2
-Description: Used to style Gutenberg Blocks in the editor.
-*/
-
-/*--------------------------------------------------------------
->>> TABLE OF CONTENTS:
-----------------------------------------------------------------
-1.0 General Typography
-2.0 General Block Settings
-3.0 Blocks - Common Blocks
-4.0 Blocks - Formatting
-5.0 Blocks - Layout Elements
-6.0 Blocks - Widgets
-
---------------------------------------------------------------*/
-
-/*--------------------------------------------------------------
-1.0 General Typography
---------------------------------------------------------------*/
-
-.edit-post-visual-editor .editor-block-list__block,
-.editor-default-block-appender textarea.editor-default-block-appender__content {
-	font-family: "Libre Baskerville", Libre, Georgia, Times, serif;
-}
-
-.edit-post-visual-editor .editor-block-list__block,
-.edit-post-visual-editor .editor-block-list__block p,
-.editor-default-block-appender textarea.editor-default-block-appender__content {
-	font-size: 16px;
-}
-
-.edit-post-visual-editor .editor-block-list__block {
-	color: #404040;
-}
-
-/* Post title */
-
-.editor-post-title__block .editor-post-title__input {
-	color: #404040;
-	font-family: "Libre Baskerville", Libre, Georgia, Times, serif;
-	font-size: 29px;
-}
-
-@media screen and ( min-width: 720px ) {
-	.editor-post-title__block .editor-post-title__input {
-		font-size: 47px;
-	}
-}
-
-/* Headings */
-
-.edit-post-visual-editor h1,
-.wp-block-freeform.block-library-rich-text__tinymce h1 {
-	font-size: 29px;
-}
-
-.edit-post-visual-editor h2,
-.wp-block-freeform.block-library-rich-text__tinymce h2 {
-	font-size: 23px;
-}
-
-.edit-post-visual-editor h3,
-.wp-block-freeform.block-library-rich-text__tinymce h3 {
-	font-size: 18px;
-}
-
-.edit-post-visual-editor h4,
-.wp-block-freeform.block-library-rich-text__tinymce h4 {
-	font-size: 14px;
-}
-
-.edit-post-visual-editor h5,
-.wp-block-freeform.block-library-rich-text__tinymce h5 {
-	font-size: 13px;
-}
-
-.edit-post-visual-editor h6,
-.wp-block-freeform.block-library-rich-text__tinymce h6 {
-	font-size: 12px;
-}
-
-@media (min-width: 720px) {
-	.editor-styles-wrapper.edit-post-visual-editor h1,
-	.wp-block-freeform.block-library-rich-text__tinymce h1 {
-		font-size: 47px;
-	}
-
-	.editor-styles-wrapper.edit-post-visual-editor h2,
-	.wp-block-freeform.block-library-rich-text__tinymce h2 {
-		font-size: 29px;
-	}
-
-	.editor-styles-wrapper.edit-post-visual-editor h3,
-	.wp-block-freeform.block-library-rich-text__tinymce h3 {
-		font-size: 23px;
-	}
-
-	.editor-styles-wrapper.edit-post-visual-editor h4,
-	.wp-block-freeform.block-library-rich-text__tinymce h4 {
-		font-size: 18px;
-	}
-
-	.editor-styles-wrapper.edit-post-visual-editor h5,
-	.wp-block-freeform.block-library-rich-text__tinymce h5 {
-		font-size: 14px;
-	}
-
-	.editor-styles-wrapper.edit-post-visual-editor h6,
-	.wp-block-freeform.block-library-rich-text__tinymce h6 {
-		font-size: 13px;
-	}
-}
-
-/*--------------------------------------------------------------
-2.0 General Block Settings
---------------------------------------------------------------*/
-
-/* Main content width */
-
-.wp-block {
-	max-width: 705px; /* 675px + 30px to account for padding */
-}
-
-/* Link styles */
-
-.edit-post-visual-editor a,
-.editor-block-list__block a,
-.wp-block-freeform.block-library-rich-text__tinymce a {
+a {
 	box-shadow: 0 1px 0 0 currentColor;
 	color: #404040;
 	text-decoration: none;
 	transition: 0.2s;
 }
 
-/* Caption styles */
-
-[class^="wp-block-"] figcaption {
-	color: inherit;
-	font-size: 14px;
-	font-style: italic;
-	position: relative;
-}
-
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption {
-	text-align: left;
-}
-
-[class^="wp-block-"]:not(.wp-block-gallery) figcaption::after {
-	border-top: 1px solid;
-	clear: both;
-	content: "";
-	display: block;
-	margin-top: .875em;
-	padding-top: .875em;
-	width: 25%;
-}
-
-.rtl [class^="wp-block-"]:not(.wp-block-gallery) figcaption {
-	text-align: right;
-}
-
-/* Table styles */
-
-.wp-block-freeform.block-library-rich-text__tinymce table,
-.wp-block-freeform.block-library-rich-text__tinymce table th,
-.wp-block-freeform.block-library-rich-text__tinymce table td {
-	border: 0;
-}
-
-.rtl .wp-block-freeform.block-library-rich-text__tinymce td,
-.rtl .wp-block-freeform.block-library-rich-text__tinymce th {
-	text-align: right;
-}
-
-/* Quote styles */
-
-.wp-block-freeform.block-library-rich-text__tinymce blockquote {
-	border: 0;
-	padding-left: 2.5em;
-}
-
-.wp-block-freeform.block-library-rich-text__tinymce blockquote:before {
-	content: "\201c";
-	display: block;
-	font-size: 72px;
-	line-height: 1;
-	position: absolute;
-	top: 0;
-	left: 0;
-}
-
-.wp-block-freeform.block-library-rich-text__tinymce blockquote cite {
-	font-style: italic;
-}
-
-.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote {
-	padding-left: 0;
-	padding-right: 2.5em;
-}
-
-.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote:before {
-	left: auto;
-	right: 0;
-}
-
-@media (min-width: 720px) {
-	.wp-block-freeform.block-library-rich-text__tinymce blockquote {
-		padding-left: 4em;
-	}
-
-	.rtl .wp-block-freeform.block-library-rich-text__tinymce blockquote {
-		padding-left: 0;
-		padding-right: 4em;
-	}
-
-	.wp-block-freeform.block-library-rich-text__tinymce blockquote p {
-		font-size: 23px;
-	}
-
-	.wp-block-freeform.block-library-rich-text__tinymce blockquote:before {
-		font-size: 129px;
-	}
-}
-
-/* Definition List styles */
-
-.wp-block-freeform.block-library-rich-text__tinymce dt {
-	font-weight: bold;
-}
-
-/* Pre styles */
-
-.editor-styles-wrapper .wp-block-freeform.block-library-rich-text__tinymce pre {
-	font-family: "Libre Baskerville", Libre, Georgia, Times, serif;
-	font-size: inherit;
-}
-
-/*--------------------------------------------------------------
-3.0 Blocks - Common Blocks
---------------------------------------------------------------*/
-
-/* Paragraph */
-
-p.has-drop-cap:not(:focus)::first-letter {
-	font-size: 5em;
-	margin-top: 0.15em;
-}
-
 /* Quote */
-
-.wp-block-quote p,
-.wp-block-quote.is-large p,
-.wp-block-quote.is-style-large p {
-	margin-bottom: 1.0em;
-}
-
 .wp-block-quote:not(.is-large):not(.is-style-large) {
 	border: 0;
-	padding-left: 0.5em;
-}
-
-.wp-block-quote:before {
-	left: -40.5px;
-}
-
-.wp-block-quote.is-large:before,
-.wp-block-quote.is-style-large:before {
-	display: none
-}
-
-.wp-block-quote__citation {
-	color: inherit;
-	font-size: inherit;
-	font-style: italic;
-}
-
-.wp-block-quote.is-large,
-.wp-block-quote.is-style-large {
-	font-style: normal;
-	padding: 0;
-}
-
-.edit-post-visual-editor .editor-block-list__block .wp-block-quote.is-large p,
-.edit-post-visual-editor .editor-block-list__block .wp-block-quote.is-style-large p {
-	font-size: 20px;
-	font-style: normal;
-}
-
-.wp-block-quote.is-large .wp-block-quote__citation,
-.wp-block-quote.is-style-large .wp-block-quote__citation {
-	font-size: 18px;
-}
-
-.rtl .wp-block-quote:before,
-.wp-block-quote[style*="text-align:right"]:before,
-.wp-block-quote[style*="text-align: right"]:before {
-	left: auto;
-	right: -40.5px;
-}
-
-.rtl .wp-block-quote:not(.is-large):not(.is-style-large)[style*="text-align:left"],
-.rtl .wp-block-quote:not(.is-large):not(.is-style-large)[style*="text-align: left"] {
-	padding-left: 0.5em;
-	padding-right: 0;
-}
-
-.rtl .wp-block-quote:not(.is-large):not(.is-style-large),
-.wp-block-quote:not(.is-large):not(.is-style-large)[style*="text-align:right"],
-.wp-block-quote:not(.is-large):not(.is-style-large)[style*="text-align: right"] {
-	padding-left: 0;
-	padding-right: 0.5em;
-}
-
-.rtl .wp-block-quote[style*="text-align:left"]:before,
-.rtl .wp-block-quote[style*="text-align: left"]:before {
-	left: -40.5px;
-	right: auto;
-}
-
-@media (min-width: 720px) {
-
-	.edit-post-visual-editor .editor-block-list__block .wp-block-quote p {
-		font-size: 23px;
-	}
-
-	.editor-styles-wrapper .wp-block-quote:before {
-		font-size: 129px;
-	}
-
-	.edit-post-visual-editor .editor-block-list__block .wp-block-quote.is-large p,
-	.edit-post-visual-editor .editor-block-list__block .wp-block-quote.is-style-large p {
-		font-size: 28.75px;
-	}
-
-	.wp-block-quote.is-large .wp-block-quote__citation,
-	.wp-block-quote.is-style-large .wp-block-quote__citation {
-		font-size: 23px;
-	}
-
-	.rtl .wp-block-quote:before,
-	.wp-block-quote[style*="text-align:right"]:before,
-	.wp-block-quote[style*="text-align: right"]:before {
-		right: -70.5px;
-	}
-
-	.rtl .wp-block-quote[style*="text-align:left"]:before,
-	.rtl .wp-block-quote[style*="text-align: left"]:before {
-		left: -70.5px;
-	}
-}
-
-/* Audio */
-
-.editor-styles-wrapper .wp-block-audio {
-	margin-left: 0;
-	margin-right: 0;
-}
-
-/* Cover */
-
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image .wp-block-cover-image-text,
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image .wp-block-cover-text,
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover-image h2,
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover .wp-block-cover-image-text,
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover .wp-block-cover-text,
-.edit-post-visual-editor .editor-block-list__block .wp-block-cover h2 {
-	font-size: 1.5em;
-}
-
-/* File */
-
-.wp-block-file :not(.wp-block-file__button) {
-	box-shadow: none;
-}
-
-.wp-block-file .wp-block-file__button {
-	border: 0 none;
-	border-radius: 0;
-	box-shadow: 0 2px 0 0 currentColor;
-	background: transparent;
-	color: #404040;
-	font-size: 18px;
-	font-size: 1rem;
-	font-weight: bold;
-	padding: 0.21875em 0;
-	transition: 0.2s;
-}
-
-/*--------------------------------------------------------------
-4.0 Blocks - Formatting
---------------------------------------------------------------*/
-
-/* Verse */
-
-.wp-block-verse {
-	font-style: italic;
-}
-
-.editor-styles-wrapper .wp-block-verse pre {
-	font-family: "Libre Baskerville", Libre, Georgia, Times, serif;
-}
-
-.wp-block-verse pre {
-	padding: 0;
-}
-
-/* Code */
-
-.wp-block-code {
-	border: none;
-	border-radius: 0;
-}
-
-.wp-block-code textarea {
-	background: transparent;
-}
-
-/* Preformatted */
-
-.editor-styles-wrapper .wp-block-preformatted pre {
-	font-family: "Libre Baskerville", Libre, Georgia, Times, serif;
 }
 
 /* Pullquote */
-
 .wp-block-pullquote {
 	border: 0;
 }
 
-.editor-styles-wrapper .wp-block-pullquote blockquote {
-	margin-left: inherit;
-	padding: 0;
-}
-
-.editor-styles-wrapper .wp-block-pullquote blockquote:before {
-	display: none;
-}
-
-.wp-block-pullquote blockquote p {
-	margin-bottom: 0.75em;
-}
-
 .wp-block-pullquote .wp-block-pullquote__citation {
 	font-size: inherit;
 	font-style: italic;
 	text-transform: none;
 }
-
-.wp-block-pullquote.alignleft blockquote > .block-library-pullquote__content .editor-rich-text__tinymce[data-is-empty="true"]::before,
-.wp-block-pullquote.alignright blockquote > .block-library-pullquote__content .editor-rich-text__tinymce[data-is-empty="true"]::before,
-.wp-block-pullquote.alignleft blockquote > .editor-rich-text p,
-.wp-block-pullquote.alignright blockquote > .editor-rich-text p {
-	font-size: 20px;
-}
-
-/* Table */
-
-.wp-block-table,
-.wp-block-table td,
-.wp-block-table th {
-	border: 0;
-}
-
-.wp-block-table th {
-	text-align: left;
-}
-
-.rtl .wp-block-table th {
-	text-align: right;
-}
-
-.wp-block-table__cell-content {
-	padding: 0;
-}
-
-/*--------------------------------------------------------------
-5.0 Blocks - Layout Elements
---------------------------------------------------------------*/
-
-/* Buttons */
-
-.wp-block-button .wp-block-button__link {
-	box-shadow: none;
-}
-
-.wp-block-button__link {
-	background: #404040;
-	color: #fff;
-	font-size: 18px;
-	font-size: 1rem;
-	font-weight: bold;
-	padding: 0.5em 1.25em;
-	transition: 0.2s;
-}
-
-.is-style-outline .wp-block-button__link {
-	border-color: currentColor;
-	background-color: transparent;
-}
-
-.is-style-outline .wp-block-button__link:not(.has-text-color) {
-	color: #222;
-}
-
-/* Separator */
-
-.wp-block-separator {
-	background-color: #ccc;
-	border: 0;
-	height: 1px;
-}
-
-/*--------------------------------------------------------------
-6.0 Blocks - Widgets
---------------------------------------------------------------*/
-
-/* General Widget styles */
-
-.edit-post-visual-editor [data-align="center"] .wp-block-categories__list,
-.edit-post-visual-editor [data-align="center"] .wp-block-archives,
-.edit-post-visual-editor [data-align="center"] .wp-block-lastest-posts {
-	list-style-position: inside;
-}
-
-/* Latest Comments */
-
-.editor-styles-wrapper .wp-block-latest-comments {
-	padding-left: 0;
-	padding-right: 0;
-}
-
-.wp-block-latest-comments__comment a {
-	box-shadow: 0 1px 0 0 rgba(0,0,0,0);
-}

libre-2/editor-style.css

@@ -1,453 +0,0 @@
-/*--------------------------------------------------------------
-# Normalize
---------------------------------------------------------------*/
-
-a {
-	background-color: transparent;
-}
-
-a:active,
-a:hover {
-	outline: 0;
-}
-
-abbr[title] {
-	border-bottom: 1px dotted;
-}
-
-b,
-strong {
-	font-weight: bold;
-}
-
-dfn {
-	font-style: italic;
-}
-
-h1 {
-	font-size: 2em;
-	margin: 0.67em 0;
-}
-
-mark {
-	background: #ff0;
-	color: #404040;
-}
-
-small {
-	font-size: 13px;
-}
-
-sub,
-sup {
-	font-size: 75%;
-	line-height: 0;
-	position: relative;
-	vertical-align: baseline;
-}
-
-sup {
-	top: -0.5em;
-}
-
-sub {
-	bottom: -0.25em;
-}
-
-img {
-	border: 0;
-}
-
-svg:not(:root) {
-	overflow: hidden;
-}
-
-figure {
-	margin: 1em 0;
-}
-
-hr {
-	box-sizing: content-box;
-	height: 0;
-}
-
-pre {
-	overflow: auto;
-}
-
-code,
-kbd,
-pre,
-samp {
-	font-family: monospace, monospace;
-	font-size: 1em;
-}
-
-button,
-input,
-optgroup,
-select,
-textarea {
-	color: inherit;
-	font: inherit;
-	margin: 0;
-}
-
-optgroup {
-	font-weight: bold;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-
-td,
-th {
-	padding: 0;
-}
-
-/*--------------------------------------------------------------
-# Typography
---------------------------------------------------------------*/
-html .mceContentBody {
-	max-width: 739px;
-}
-body.mceContentBody {
-	color: #404040;
-	font-family: "Libre Baskerville", Libre 2, Georgia, Times, serif;
-	font-size: 18px;
-	font-size: 1rem;
-	line-height: 1.75;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-	clear: both;
-	font-family: "Libre Baskerville", Libre 2, Georgia, Times, serif;
-	font-weight: bold;
-	margin: 0 0 .875em;
-}
-h1 {
-	font-size: 29px;
-	font-size: 1.8125rem;
-	line-height: 1.3;
-}
-h2 {
-	font-size: 23px;
-	font-size: 1.4375rem;
-}
-h3 {
-	font-size: 18px;
-	font-size: 1rem;
-}
-h4 {
-	font-size: 14px;
-	font-size: .875rem;
-}
-h5 {
-	font-size: 13px;
-	font-size: .8125rem;
-}
-h6 {
-	font-size: 12px;
-	font-size: .75rem;
-}
-p {
-	margin-top: 0;
-	margin-bottom: 1.75em;
-}
-
-dfn,
-cite,
-em,
-i {
-	font-style: italic;
-}
-
-blockquote {
-	margin: 0 1.75em 1.75em 2.25em;
-	font-size: 18px;
-}
-
-address {
-	margin: 0 0 1.75em;
-}
-
-pre {
-	font-family: "Libre Baskerville", Libre 2, Georgia, Times, serif;
-	margin-bottom: 1.75em;
-	max-width: 100%;
-	overflow: auto;
-}
-
-code,
-kbd,
-tt,
-var {
-	font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
-	font-size: 16px;
-}
-
-abbr,
-acronym {
-	border-bottom: 1px dotted #666;
-	cursor: help;
-}
-
-mark,
-ins {
-	background: #fff9c0;
-	text-decoration: none;
-}
-
-big {
-	font-size: 125%;
-}
-
-/*--------------------------------------------------------------
-# Elements
---------------------------------------------------------------*/
-html {
-	box-sizing: border-box;
-}
-
-body {
-	background: #fff; /* Fallback for when there is no custom background color defined. */
-}
-
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
-	content: "";
-}
-
-blockquote,
-q {
-	quotes: "" "";
-}
-
-blockquote {
-	position: relative;
-}
-blockquote:before {
-	content: "\201c";
-	display: block;
-	font-size: 72px;
-	line-height: 1;
-	position: absolute;
-		top: 0;
-		left: -.6em;
-}
-blockquote blockquote {
-	margin-right: 0;
-}
-blockquote.alignleft,
-blockquote.alignright {
-	max-width: 47%;
-}
-blockquote.alignleft,
-blockquote.aligncenter {
-	margin-left: 2em;
-}
-blockquote.alignright {
-	margin-left: 3.5em;
-}
-.comments-area blockquote {
-	font-size: 18px;
-}
-
-.intro {
-	font-style: italic;
-	font-size: 23px;
-}
-
-hr {
-	background-color: #404040;
-	border: 0;
-	height: 1px;
-	margin-bottom: 1.75em;
-}
-
-ul,
-ol {
-	margin: 0 0 1.75em 0;
-	padding-left: 1.75em;
-}
-
-ul {
-	list-style: disc;
-}
-
-ol {
-	list-style: decimal;
-}
-
-li > ul,
-li > ol {
-	margin-bottom: 0;
-	margin-left: .4375em;
-}
-
-dt {
-	font-weight: bold;
-}
-
-dd {
-	margin: 0 1.75em 1.75em;
-}
-
-img {
-	height: auto; /* Make sure images are scaled correctly. */
-	max-width: 100%; /* Adhere to container width. */
-}
-
-table {
-	margin: 0 0 1.75em;
-	width: 100%;
-}
-
-td {
-	padding: 3px;
-}
-
-caption {
-	font-weight: bold;
-	padding: .4375em 0;
-}
-
-/*--------------------------------------------------------------
-## Captions
---------------------------------------------------------------*/
-.wp-caption {
-	max-width: 100%;
-	padding: 0;
-	margin-bottom: 1.75em;
-}
-.wp-caption img[class*="wp-image-"] {
-	display: block;
-	margin: 0 auto;
-}
-.wp-caption-dd {
-	font-size: 14px;
-	font-style: italic;
-	position: relative;
-}
-.wp-caption-dd:before {
-	content: "\2014";
-	font-style: normal;
-	position: absolute;
-		top: 0;
-		left: -1.75em;
-}
-.wp-caption .wp-caption-dd {
-	margin: 0.8075em 0;
-}
-
-/*--------------------------------------------------------------
-# Alignments
---------------------------------------------------------------*/
-.alignleft {
-	display: inline;
-	float: left;
-	margin: .875em 1.75em .875em 0 !important;
-}
-
-.alignright {
-	display: inline;
-	float: right;
-	margin: .875em 0 .875em 1.75em !important;
-}
-
-.aligncenter {
-	clear: both;
-	display: block;
-	margin: .875em auto !important;
-}
-
-/*--------------------------------------------------------------
-## Galleries
---------------------------------------------------------------*/
-.gallery {
-	margin-bottom: 1.75em;
-}
-
-.gallery-item {
-	display: inline-block;
-	padding: 0.4375em;
-	margin: 0;
-	text-align: center;
-	vertical-align: top;
-	width: 100%;
-}
-
-.gallery-columns-2 .gallery-item {
-	max-width: 50%;
-}
-
-.gallery-columns-3 .gallery-item {
-	max-width: 33.33%;
-}
-
-.gallery-columns-4 .gallery-item {
-	max-width: 25%;
-}
-
-.gallery-columns-5 .gallery-item {
-	max-width: 20%;
-}
-
-.gallery-columns-6 .gallery-item {
-	max-width: 16.66%;
-}
-
-.gallery-columns-7 .gallery-item {
-	max-width: 14.28%;
-}
-
-.gallery-columns-8 .gallery-item {
-	max-width: 12.5%;
-}
-
-.gallery-columns-9 .gallery-item {
-	max-width: 11.11%;
-}
-
-.gallery-caption {
-	display: block;
-}
-
-@media screen and ( min-width: ) {
-	h1,
-	.singular .entry-title {
-		font-size: 47px;
-		font-size: 2.9375rem;
-		margin: 0 0 0.4375em;
-	}
-	h2 {
-		font-size: 29px;
-		font-size: 1.8125rem;
-		margin: 0 0 0.4375em;
-	}
-	h3 {
-		font-size: 23px;
-		font-size: 1.4375rem;
-	}
-	h4 {
-		font-size: 18px;
-		font-size: 1rem;
-	}
-	h5 {
-		font-size: 14px;
-		font-size: .875rem;
-	}
-	h6 {
-		font-size: 13px;
-		font-size: .8125rem;
-	}
-}

libre-2/functions.php

@@ -32,9 +32,6 @@ if ( ! function_exists( 'libre_2_setup' ) ) :
 		 */
 		add_theme_support( 'title-tag' );
 
-		/* Add support for editor styles */
-		add_editor_style( array( 'editor-style.css', libre_2_fonts_url() ) );
-
 		// This theme uses wp_nav_menu() in one location.
 		register_nav_menus(
 			array(
@@ -88,8 +85,17 @@ if ( ! function_exists( 'libre_2_setup' ) ) :
 			)
 		);
 
-		// Load regular editor styles into the new block-based editor.
+		/* Add support for editor styles */
 		add_theme_support( 'editor-styles' );
+		// Load regular editor styles into the new block-based editor.
+		add_editor_style(
+			array(
+				'style.css',
+				'/css/blocks.css',
+				'/css/editor-blocks.css',
+				libre_2_fonts_url(),
+			)
+		);
 
 		// Add support for responsive embeds.
 		add_theme_support( 'responsive-embeds' );
@@ -260,19 +266,6 @@ function libre_2_scripts() {
 }
 add_action( 'wp_enqueue_scripts', 'libre_2_scripts' );
 
-/**
- * Enqueue editor styles for Gutenberg
- */
-function libre_2_block_editor_styles() {
-	// Block styles.
-	wp_enqueue_style( 'libre-2-block-editor-style', get_theme_file_uri( '/css/editor-blocks.css' ) );
-
-	// Fonts.
-	wp_enqueue_style( 'libre-2-fonts', libre_2_fonts_url(), array(), null );
-}
-add_action( 'enqueue_block_editor_assets', 'libre_2_block_editor_styles' );
-
-
 /*
  * Filters the Categories archive widget to add a span around the post count
  */

libre-2/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/libre-2/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: A stylish, classic look for your personal blog or long-form writing site. The main navigation bar stays fixed to the top while your visitors read, keeping your most important content at hand, while three footer widget areas give your secondary content a comfortable home.
-Version: 2.2.5-wpcom
+Version: 2.2.6-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: libre

mayland-blocks/assets/alignments.css

@@ -0,0 +1,78 @@
+/*
+ * Alignments, loaded in the front-end only.
+ */
+
+body {
+	margin: 0;
+}
+
+* {
+	box-sizing: border-box;
+}
+
+.wp-site-blocks {
+	padding: 0 var(--wp--custom--margin--horizontal);
+}
+
+.wp-site-blocks > *:not(.wp-block-post-content),
+.wp-site-blocks .wp-block-post-content > * {
+	max-width: var(--wp--custom--width--default);
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.wp-site-blocks .alignwide {
+	width: var(--wp--custom--width--wide);
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.wp-site-blocks .alignfull {
+	transform: translateX(calc(0px - var(--wp--custom--margin-horizontal)));
+	width: calc(100% + (2 * var(--wp--custom--margin-horizontal)));
+	max-width: calc(100% + (2 * var(--wp--custom--margin-horizontal)));
+	margin-left: 0;
+	margin-right: 0;
+	box-sizing: content-box;
+}
+
+.wp-site-blocks .wp-block-template-part.alignfull {
+	width: 100%;
+	max-width: 100%;
+}
+
+.wp-site-blocks .wp-block-columns.alignfull {
+	width: 100%;
+	max-width: 100%;
+}
+
+.aligncenter {
+	text-align: center;
+}
+
+.wp-site-blocks .alignleft {
+	float: left;
+	margin-right: 2em;
+	max-width: 360px;
+}
+
+.wp-site-blocks .alignright {
+	float: right;
+	margin-left: 2em;
+	max-width: 360px;
+}
+
+@media screen and (min-width: 1290px) {
+
+	.wp-site-blocks,
+	.wp-block-template-part.alignfull {
+		padding: 0;
+	}
+
+	.wp-site-blocks .alignfull {
+		transform: translateX(0px);
+		width: 100% + var(--wp--custom--width-horizontal);
+		max-width: calc(100% + var(--wp--custom--width-horizontal));
+	}
+}

mayland-blocks/block-template-parts/footer.html

@@ -0,0 +1,21 @@
+<!-- wp:spacer {"height":32} -->
+<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"verticalAlignment":"center","align":"full"} -->
+<div class="wp-block-columns alignfull are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
+<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"textColor":"foreground-light","fontSize":"small"} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"verticalAlignment":"center"} -->
+<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"orientation":"horizontal","textColor":"foreground-light","itemsJustification":"right","fontSize":"small"} -->
+<!-- wp:navigation-link {"label":"Home","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"Services","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"Portfolio","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"Contact","url":"#"} /-->
+<!-- /wp:navigation --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->

mayland-blocks/block-template-parts/header.html

@@ -0,0 +1,29 @@
+<!-- wp:spacer {"height":14} -->
+<div style="height:14px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"verticalAlignment":"bottom","align":"full"} -->
+<div class="wp-block-columns alignfull are-vertically-aligned-bottom"><!-- wp:column {"verticalAlignment":"bottom"} -->
+<div class="wp-block-column is-vertically-aligned-bottom"><!-- wp:site-title /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column {"verticalAlignment":"center","className":"is-vertically-aligned-bottom"} -->
+<div class="wp-block-column is-vertically-aligned-center is-vertically-aligned-bottom">
+	
+<!-- wp:social-links {"iconColor":"primary","iconColorValue":"#000000","align":"right","className":"is-style-logos-only"} -->
+<ul class="wp-block-social-links alignright has-icon-color is-style-logos-only" style="--wp--social-links--icon-color:#000000"><!-- wp:social-link {"url":"https://instagram.com","service":"instagram"} /-->
+
+<!-- wp:social-link {"url":"https://twitter.com","service":"twitter"} /--></ul>
+<!-- /wp:social-links -->
+
+<!-- wp:navigation {"orientation":"horizontal","itemsJustification":"right"} -->
+<!-- wp:navigation-link {"label":"Home","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"About","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"Blog","url":"#"} /-->
+
+<!-- wp:navigation-link {"label":"Contact","url":"#"} /-->
+<!-- /wp:navigation --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->

mayland-blocks/block-templates/front-page.html

@@ -0,0 +1,5 @@
+<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
+
+<!-- wp:post-content /-->
+
+<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->

mayland-blocks/block-templates/index.html

@@ -0,0 +1,17 @@
+<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
+
+<!-- wp:query {"queryId":1,"query":{"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
+<!-- wp:query-loop -->
+<!-- wp:post-title {"isLink":true} /-->
+
+<!-- wp:post-excerpt /-->
+
+<!-- wp:post-date /-->
+
+<!-- wp:spacer -->
+<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+<!-- /wp:query-loop -->
+<!-- /wp:query -->
+
+<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->

mayland-blocks/block-templates/page.html

@@ -0,0 +1,11 @@
+<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
+
+<!-- wp:spacer {"height":32} -->
+<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-title {"level":1} /-->
+
+<!-- wp:post-content /-->
+
+<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->

mayland-blocks/block-templates/single.html

@@ -0,0 +1,35 @@
+<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->
+
+<!-- wp:spacer {"height":32} -->
+<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-title {"level":1} /-->
+
+<!-- wp:post-date /-->
+
+<!-- wp:spacer {"height":16px} -->
+<div style="height:16px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-content /-->
+
+<!-- wp:spacer {"height":16px} -->
+<div style="height:16px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-date /-->
+
+<!-- wp:spacer {"height":64} -->
+<div style="height:64px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-author {"showAvatar":false,"showBio":true,"byline":"Published by","fontSize":"huge"} /-->
+
+<!-- wp:spacer {"height":32} -->
+<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-comments /-->
+
+<!-- wp:template-part {"slug":"footer","align":"full","tagName":"footer","className":"site-footer"} /-->

mayland-blocks/experimental-theme.json

@@ -0,0 +1,192 @@
+{
+	"settings": {
+		"defaults": {
+			"color": {
+				"gradients": [ ],
+				"palette": [
+					{
+						"slug": "primary",
+						"color": "#000000",
+						"name": "Primary"
+					},
+					{
+						"slug": "secondary",
+						"color": "#1a1a1a",
+						"name": "Secondary"
+					},
+					{
+						"slug": "background",
+						"color": "#FFFFFF",
+						"name": "Background"
+					},
+					{
+						"slug": "foreground",
+						"color": "#010101",
+						"name": "Foreground"
+					},
+					{
+						"slug": "foreground-light",
+						"color": "#666666",
+						"name": "Foreground Light"
+					},
+					{
+						"slug": "foreground-dark",
+						"color": "#333333",
+						"name": "Foreground Dark"
+					}
+				]
+			},
+			"typography": {
+				"customFontSize": true,
+				"customLineHeight": true,
+				"fontSizes": [
+					{
+						"name": "Small",
+						"size": "16.6px",
+						"slug": "small"
+					},
+					{
+						"name": "Normal",
+						"size": "20px",
+						"slug": "normal"
+					},
+					{
+						"name": "Large",
+						"size": "28.8px",
+						"slug": "large"
+					},
+					{
+						"name": "Huge",
+						"size": "34.56px",
+						"slug": "huge"
+					}
+				],
+				"fontFamilies": [
+					{
+						"fontFamily": "\"Poppins\", sans-serif",
+						"slug": "poppins",
+						"name": "Poppins"
+					},
+					{
+						"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
+						"slug": "system-font",
+						"name": "System Font"
+					},
+					{
+						"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
+						"slug": "helvetica-arial"
+					},
+					{
+						"fontFamily": "Geneva, Tahoma, Verdana, sans-serif",
+						"slug": "geneva-verdana"
+					},
+					{
+						"fontFamily": "Cambria, Georgia, serif",
+						"slug": "cambria-georgia"
+					},
+					{
+						"fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif",
+						"slug": "hoefler-times-new-roman"
+					}
+				]
+			},
+			"spacing": {
+				"customPadding": true,
+				"units": [ "px", "em", "rem", "vh", "vw" ]
+			},
+			"custom": {
+				"line-height": {
+					"body": 1.6,
+					"headings": 1.125
+				},
+				"margin": {
+					"horizontal": "32px"
+				},
+				"width": {
+					"default": "750px",
+					"wide": "1022px"
+				}
+			}
+		}
+	},
+	"styles": {
+		"root": {
+			"color": {
+				"background": "var(--wp--preset--color--background)",
+				"text": "var(--wp--preset--color--foreground)",
+				"link": "var(--wp--preset--color--foreground)"
+			},
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--normal)",
+				"lineHeight": "var(--wp--custom--line-height--body)",
+				"fontFamily": "var(--wp--preset--font-family--poppins)"
+			}
+		},
+		"core/heading/h1": {
+			"typography": {
+				"fontSize": "41.47px",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/heading/h2": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--huge)",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/heading/h3": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--large)",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/heading/h4": {
+			"typography": {
+				"fontSize": "24px",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/heading/h5": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--normal)",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/heading/h6": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--small)",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/post-title/h1": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--huge)",
+				"lineHeight": "var(--wp--custom--line-height--headings)"
+			}
+		},
+		"core/post-date": {
+			"color": {
+				"text": "var(--wp--preset--color--foreground-light)",
+				"link": "var(--wp--preset--color--foreground-light)"
+			},
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--small)"
+			}
+		},
+		"core/site-title": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--large)"
+			}
+		},
+		"core/navigation": {
+			"typography": {
+				"fontSize": "var(--wp--preset--font-size--small)"
+			}
+		},
+		"core/button": {
+			"color": {
+				"background": "var(--wp--preset--color--primary)"
+			}
+		}
+	}
+}

mayland-blocks/functions.php

@@ -0,0 +1,74 @@
+<?php
+
+if ( ! function_exists( 'mayland_blocks_support' ) ) :
+	function mayland_blocks_support()  {
+
+		// Alignwide and alignfull classes in the block editor.
+		add_theme_support( 'align-wide' );
+
+		// Adding support for core block visual styles.
+		add_theme_support( 'wp-block-styles' );
+
+		// Adding support for responsive embedded content.
+		add_theme_support( 'responsive-embeds' );
+
+		// Add support for experimental link color control.
+		add_theme_support( 'experimental-link-color' );
+
+		// Add support for editor styles.
+		add_theme_support( 'editor-styles' );
+
+		// Enqueue editor styles.
+		add_editor_style( array( 
+			'style.css',
+			mayland_blocks_fonts_url()
+		) );
+    }
+    add_action( 'after_setup_theme', 'mayland_blocks_support' );
+endif;
+
+/**
+ * Add Google webfonts, if necessary.
+ *
+ * - See: http://themeshaper.com/2014/08/13/how-to-add-google-fonts-to-wordpress-themes/
+ */
+function mayland_blocks_fonts_url() {
+
+	$fonts_url = '';
+
+	/* Translators: If there are characters in your language that are not
+	* supported by Poppins, translate this to 'off'. Do not translate
+	* into your own language.
+	*/
+	$poppins = esc_html_x( 'on', 'Poppins font: on or off', 'mayland' );
+
+	if ( 'off' !== $poppins ) {
+		$font_families = array();
+
+		$font_families[] = 'Poppins:400,400i,600,600i';
+
+		$query_args = array(
+			'family' => urlencode( implode( '|', $font_families ) ),
+			'subset' => urlencode( 'latin,latin-ext' ),
+		);
+
+		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+	}
+
+	return esc_url_raw( $fonts_url );
+}
+
+/**
+ * Enqueue scripts and styles.
+ */
+function mayland_blocks_scripts() {
+	// Enqueue front-end styles.
+	wp_enqueue_style( 'mayland-blocks-styles', get_stylesheet_uri() );
+
+	// Enqueue front-end styles.
+	wp_enqueue_style( 'mayland-blocks-block-styles', get_stylesheet_directory_uri() . '/assets/alignments.css' );
+
+	// Enqueue Google fonts, if necessary.
+	wp_enqueue_style( 'mayland-blocks-fonts', mayland_blocks_fonts_url(), array(), null );
+}
+add_action( 'wp_enqueue_scripts', 'mayland_blocks_scripts' );

mayland-blocks/style.css

@@ -0,0 +1,67 @@
+/*
+Theme Name: Mayland (Blocks)
+Theme URI: https://github.com/Automattic/themes/tree/master/mayland-blocks
+Author: Automattic
+Author URI: https://automattic.com/
+Description: Make your online portfolio wonderfully uncluttered with Mayland. Gracefully highlight your photography and other projects. Mayland is versatile enough to be your personal site too.
+Requires at least: WordPress 4.9.6
+Version: 1.2.9
+License: GNU General Public License v2 or later
+License URI: LICENSE
+Text Domain: mayland-blocks
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
+
+This theme, like WordPress, is licensed under the GPL.
+Use it to make something cool, have fun, and share what you've learned with others.
+*/
+
+
+/* Smooth out the fonts. */
+
+body {
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+/* Set editor widths. */
+
+.wp-block {
+	max-width: var(--wp--custom--width--default);
+}
+
+.wp-block[data-align="wide"] {
+	max-width: var(--wp--custom--width--wide);
+}
+
+.wp-block[data-align="full"] {
+	max-width: inherit;
+}
+
+/* Adjust header spacing. */
+
+.site-header .wp-block-site-title a {
+	text-decoration: none;
+}
+
+.site-header .wp-block-navigation {
+	margin-bottom: 0;
+}
+
+.site-header .wp-block-social-links.alignright {
+	margin: 0 0 0 1em;
+	transform: translateY(-0.3rem);
+}
+
+@media screen and (min-width: 1290px) {
+	.site-header .wp-block-column,
+	.site-footer .wp-block-column {
+		padding-left: var(--wp--custom--margin--horizontal);
+		padding-right: var(--wp--custom--margin--horizontal);
+	}
+}
+
+/* Adjust heading letter spacing. */
+
+h1, h2, h3 {
+	letter-spacing: -0.015em;
+}

mayland/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mayland",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

mayland/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mayland",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "mayland",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

mayland/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio wonderfully uncluttered with Mayland. Gracefully highlight your photography and other projects. Mayland is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

mayland/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #666666;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -464,10 +468,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button {
 	line-height: 1;
 	color: white;
@@ -483,14 +484,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	content: '';
 	display: block;
@@ -498,34 +493,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button {
 	color: white;
 	background-color: #666666;
@@ -595,6 +575,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;

mayland/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio wonderfully uncluttered with Mayland. Gracefully highlight your photography and other projects. Mayland is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #666666;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #666666;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

mayland/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio wonderfully uncluttered with Mayland. Gracefully highlight your photography and other projects. Mayland is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.5
+Version: 1.3.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #666666;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #ffffff;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #666666;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

maywood/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "maywood",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

maywood/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maywood",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Maywood",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

maywood/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

maywood/style-editor.css

@@ -193,6 +193,10 @@ a:hover {
 	color: #685636;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -479,10 +483,7 @@ object {
  *   let’s use a placeholder to keep them all
  *   in-sync
  */
-.wp-block-a8c-blog-posts + .button, button,
-.button,
-input[type="submit"],
-.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button, .wp-block-button__link,
 .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
 	color: white;
@@ -498,14 +499,8 @@ input[type="submit"],
 	padding: 16px 16px;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
-.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
+.wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -513,34 +508,19 @@ input[type="submit"]:after,
 	width: 0;
 }
 
-.wp-block-a8c-blog-posts + .button:before, button:before,
-.button:before,
-input[type="submit"]:before,
-.wp-block-button__link:before,
+.wp-block-a8c-blog-posts + .button:before, .wp-block-button__link:before,
 .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.wp-block-a8c-blog-posts + .button:after, button:after,
-.button:after,
-input[type="submit"]:after,
-.wp-block-button__link:after,
+.wp-block-a8c-blog-posts + .button:after, .wp-block-button__link:after,
 .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-button:not(.has-background):hover,
-.button:not(.has-background):hover,
-input:not(.has-background):hover[type="submit"],
-.wp-block-button__link:not(.has-background):hover,
-.wp-block-file__button:not(.has-background):hover, button:focus,
-.button:focus,
-input:focus[type="submit"],
-.wp-block-button__link:focus,
-.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, button.has-focus,
-.has-focus.button,
-input.has-focus[type="submit"],
-.has-focus.wp-block-button__link,
+.wp-block-a8c-blog-posts + .button:not(.has-background):hover, .wp-block-button__link:not(.has-background):hover,
+.wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .wp-block-a8c-blog-posts + .button:focus, .wp-block-button__link:focus,
+.wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .wp-block-a8c-blog-posts + .has-focus.button, .has-focus.wp-block-button__link,
 .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: white;
 	background-color: #685636;
@@ -610,6 +590,11 @@ input.has-focus[type="submit"],
 	background: transparent;
 }
 
+.has-primary-background-color .wp-block-button__link.is-style-outline:not(.has-text-color), .has-primary-background-color
+.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button__link.is-style-squared,
 .is-style-squared .wp-block-button__link {
 	border-radius: 0;
@@ -1761,8 +1746,6 @@ b, strong {
 	width: 100%;
 }
 
-.fse-template-part .main-navigation button,
-.fse-template-part .main-navigation input[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link,
 .fse-template-part .main-navigation .wp-block-file__button, .fse-template-part .main-navigation .button {
 	line-height: 1;
@@ -1779,12 +1762,8 @@ b, strong {
 	padding: 16px 16px;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
-.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
-.fse-template-part .main-navigation .wp-block-button__link:after,
+.fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before, .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	content: '';
 	display: block;
@@ -1792,29 +1771,19 @@ b, strong {
 	width: 0;
 }
 
-.fse-template-part .main-navigation button:before,
-.fse-template-part .main-navigation input[type="submit"]:before,
 .fse-template-part .main-navigation .wp-block-button__link:before,
 .fse-template-part .main-navigation .wp-block-file__button:before, .fse-template-part .main-navigation .button:before {
 	margin-bottom: -0.12em;
 }
 
-.fse-template-part .main-navigation button:after,
-.fse-template-part .main-navigation input[type="submit"]:after,
 .fse-template-part .main-navigation .wp-block-button__link:after,
 .fse-template-part .main-navigation .wp-block-file__button:after, .fse-template-part .main-navigation .button:after {
 	margin-top: -0.11em;
 }
 
-.fse-template-part .main-navigation button:not(.has-background):hover,
-.fse-template-part .main-navigation input:not(.has-background):hover[type="submit"],
 .fse-template-part .main-navigation .wp-block-button__link:not(.has-background):hover,
-.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation button:focus,
-.fse-template-part .main-navigation input:focus[type="submit"],
-.fse-template-part .main-navigation .wp-block-button__link:focus,
-.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation button.has-focus,
-.fse-template-part .main-navigation input.has-focus[type="submit"],
-.fse-template-part .main-navigation .has-focus.wp-block-button__link,
+.fse-template-part .main-navigation .wp-block-file__button:not(.has-background):hover, .fse-template-part .main-navigation .button:not(.has-background):hover, .fse-template-part .main-navigation .wp-block-button__link:focus,
+.fse-template-part .main-navigation .wp-block-file__button:focus, .fse-template-part .main-navigation .button:focus, .fse-template-part .main-navigation .has-focus.wp-block-button__link,
 .fse-template-part .main-navigation .has-focus.wp-block-file__button, .fse-template-part .main-navigation .has-focus.button {
 	color: white;
 	background-color: #685636;

maywood/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #685636;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #685636;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

maywood/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Maywood is a refined theme designed for restaurants and food-related businesses seeking a modern look.
 Requires at least: WordPress 4.9.6
-Version: 1.5.5
+Version: 1.5.7
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -686,6 +686,10 @@ a:hover {
 	color: #685636;
 }
 
+.has-primary-background-color a:not(.has-text-color) {
+	color: #FFFFFF;
+}
+
 button,
 a {
 	cursor: pointer;
@@ -1448,6 +1452,11 @@ button[data-load-more-btn], .button {
 	color: #685636;
 }
 
+.has-primary-background-color .wp-block-button.is-style-outline.wp-block-button__link:not(.has-text-color), .has-primary-background-color
+.wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color) {
+	color: white;
+}
+
 .wp-block-button.is-style-squared,
 .wp-block-button.is-style-squared .wp-block-button__link {
 	border-radius: 0;

morden/experimental-theme.json

@@ -0,0 +1,9 @@
+{
+	"styles": {
+		"root": {
+			"color": {
+				"link": "var(--wp--preset--color--primary)"
+			}
+		}
+	}
+} 

morden/functions.php

@@ -68,6 +68,9 @@ if ( ! function_exists( 'morden_setup' ) ) :
 		if ( function_exists( 'varia_mobile_nav_on_side_setup' ) ) {
 			varia_mobile_nav_on_side_setup();
 		}
+
+		// Add support for experimental link color via Gutenberg: https://github.com/WordPress/gutenberg/blob/master/docs/designers-developers/developers/themes/theme-support.md
+		add_theme_support( 'experimental-link-color' );
 	}
 endif;
 add_action( 'after_setup_theme', 'morden_setup', 12 );

morden/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "morden",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

morden/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morden",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "Morden",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"