Merge branch 'master' into varia_add_posts_list_block_support

modern-business/inc/fse-template-data.php

@@ -129,9 +129,9 @@ class A8C_WP_Template_Data_Inserter {
 	 * @return string
 	 */
 	public function get_template_content( $header_id, $footer_id ) {
-		return "<!-- wp:a8c/template {\"templateId\":$header_id,\"align\":\"full\"} /-->" .
-		       '<!-- wp:a8c/post-content {"align":"full"} /-->' .
-		       "<!-- wp:a8c/template {\"templateId\":$footer_id,\"align\":\"full\"} /-->";
+		return "<!-- wp:a8c/template {\"templateId\":$header_id} /-->" .
+		       '<!-- wp:a8c/post-content /-->' .
+		       "<!-- wp:a8c/template {\"templateId\":$footer_id} /-->";
 	}
 
 	/**

redhill/sass/_extra-child-theme.scss

@@ -12,7 +12,9 @@ a {
 	text-decoration: none;
 
 	.wp-block-cover &,
-	.wp-block-cover-image & {
+	.wp-block-cover-image &,
+	.wp-block-media-text &,
+	p & {
 		text-decoration: underline;
 
 		&.wp-block-button__link,

redhill/style-editor.css

@@ -178,6 +178,10 @@ body {
 	-webkit-font-smoothing: antialiased;
 }
 
+.editor-post-title__block {
+	font-size: 20px;
+}
+
 p {
 	font-size: 1em;
 	line-height: 1.6;
@@ -444,7 +448,15 @@ object {
 	padding-left: 0;
 }
 
-.wp-block-media-text .block-editor-inner-blocks a {
+.wp-block-media-text[style*="background-color"]:not(.has-background-background-color) .block-editor-inner-blocks a {
+	color: currentColor;
+}
+
+p.has-background {
+	padding: 16px 16px;
+}
+
+p.has-background:not(.has-background-background-color) a {
 	color: currentColor;
 }
 

redhill/style-rtl.css

@@ -1585,7 +1585,7 @@ dd {
 	margin-bottom: 0;
 }
 
-.wp-block-media-text .wp-block-media-text__content a {
+.wp-block-media-text[class*="background-color"]:not(.has-background-background-color) .wp-block-media-text__content a, .wp-block-media-text[style*="background-color"] .wp-block-media-text__content a {
 	color: currentColor;
 }
 
@@ -1604,6 +1604,10 @@ p.has-background {
 	padding: 16px 16px;
 }
 
+p.has-background:not(.has-background-background-color) a {
+	color: currentColor;
+}
+
 .wp-block-pullquote {
 	padding: calc( 3 * 16px) 0;
 	margin-right: 0;

redhill/style.css

@@ -1585,7 +1585,7 @@ dd {
 	margin-bottom: 0;
 }
 
-.wp-block-media-text .wp-block-media-text__content a {
+.wp-block-media-text[class*="background-color"]:not(.has-background-background-color) .wp-block-media-text__content a, .wp-block-media-text[style*="background-color"] .wp-block-media-text__content a {
 	color: currentColor;
 }
 
@@ -1604,6 +1604,10 @@ p.has-background {
 	padding: 16px 16px;
 }
 
+p.has-background:not(.has-background-background-color) a {
+	color: currentColor;
+}
+
 .wp-block-pullquote {
 	padding: calc( 3 * 16px) 0;
 	margin-left: 0;
@@ -2992,13 +2996,19 @@ a {
 }
 
 .wp-block-cover a,
-.wp-block-cover-image a {
+.wp-block-cover-image a,
+.wp-block-media-text a,
+p a {
 	text-decoration: underline;
 }
 
 .wp-block-cover a.wp-block-button__link, .wp-block-cover a:hover,
 .wp-block-cover-image a.wp-block-button__link,
-.wp-block-cover-image a:hover {
+.wp-block-cover-image a:hover,
+.wp-block-media-text a.wp-block-button__link,
+.wp-block-media-text a:hover,
+p a.wp-block-button__link,
+p a:hover {
 	text-decoration: none;
 }
 

varia/inc/style-wpcom.css

@@ -9,7 +9,7 @@
 	display: none;
 }
 
-.home.page.hide-homepage-title .hentry:not(.has-post-thumbnail) .entry-content > .alignfull:first-child {
+.home.page.hide-homepage-title .site-main > article > .entry-content {
 	margin-top: 0;
 }
 
@@ -38,4 +38,4 @@
  */
 .hide-footer-credit .comma {
 	display: none;
-}
+}

varia/sass/base/_editor.scss

@@ -9,6 +9,11 @@ body {
 	-webkit-font-smoothing: antialiased;
 }
 
+// Set font size of title block the same as body.
+.editor-post-title__block {
+	font-size: #{map-deep-get($config-global, "font", "size", "root")};
+}
+
 p {
 	font-size: (strip-unit(map-deep-get($config-global, "font", "size", "base")) + 0em);
 	line-height: #{map-deep-get($config-global, "font", "line-height", "body")};
@@ -25,5 +30,5 @@ a {
 
 button,
 a {
-  cursor: pointer;
+	cursor: pointer;
 }

varia/sass/blocks/_editor.scss

@@ -15,6 +15,7 @@
 @import "latest-posts/editor";
 @import "media-text/editor";
 @import "posts-list/editor";
+@import "paragraph/editor";
 @import "pullquote/editor";
 @import "quote/editor";
 @import "separator/editor";

varia/sass/blocks/media-text/_editor.scss

@@ -1,8 +1,10 @@
 .wp-block-media-text {
 
-	.block-editor-inner-blocks {
-		a {
-			color: currentColor;
+  &[style*="background-color"]:not(.has-background-background-color) {
+		.block-editor-inner-blocks {
+			a {
+				color: currentColor;
+			}
 		}
 	}
-}
+}

varia/sass/blocks/media-text/_style.scss

@@ -17,9 +17,14 @@
 				margin-bottom: 0;
 			}
 		}
+	}
 
-		a {
-			color: currentColor;
+	&[class*="background-color"]:not(.has-background-background-color),
+	&[style*="background-color"] {
+		.wp-block-media-text__content {
+			a {
+				color: currentColor;
+			}
 		}
 	}
 
@@ -38,4 +43,4 @@
 			padding: 0 #{map-deep-get($config-global, "spacing", "horizontal")};
 		}
 	}
-}
+}

varia/sass/blocks/paragraph/_editor.scss

@@ -0,0 +1,9 @@
+p {
+	&.has-background {
+		padding: #{map-deep-get($config-global, "spacing", "unit")} #{map-deep-get($config-global, "spacing", "unit")};
+
+		&:not(.has-background-background-color) a {
+			color: currentColor;
+		}
+	}
+}

varia/sass/blocks/paragraph/_style.scss

@@ -2,5 +2,9 @@ p {
 	// inherits general font style set at <body>
 	&.has-background {
 		padding: #{map-deep-get($config-global, "spacing", "unit")} #{map-deep-get($config-global, "spacing", "unit")};
+
+		&:not(.has-background-background-color) a {
+			color: currentColor;
+		}
 	}
 }

varia/style-editor.css

@@ -134,6 +134,10 @@ body {
 	-webkit-font-smoothing: antialiased;
 }
 
+.editor-post-title__block {
+	font-size: 18px;
+}
+
 p {
 	font-size: 1em;
 	line-height: 1.78;
@@ -390,7 +394,15 @@ object {
 	padding-left: 0;
 }
 
-.wp-block-media-text .block-editor-inner-blocks a {
+.wp-block-media-text[style*="background-color"]:not(.has-background-background-color) .block-editor-inner-blocks a {
+	color: currentColor;
+}
+
+p.has-background {
+	padding: 16px 16px;
+}
+
+p.has-background:not(.has-background-background-color) a {
 	color: currentColor;
 }
 

varia/style-rtl.css

@@ -1550,7 +1550,7 @@ dd {
 	margin-bottom: 0;
 }
 
-.wp-block-media-text .wp-block-media-text__content a {
+.wp-block-media-text[class*="background-color"]:not(.has-background-background-color) .wp-block-media-text__content a, .wp-block-media-text[style*="background-color"] .wp-block-media-text__content a {
 	color: currentColor;
 }
 
@@ -1569,6 +1569,10 @@ p.has-background {
 	padding: 16px 16px;
 }
 
+p.has-background:not(.has-background-background-color) a {
+	color: currentColor;
+}
+
 .a8c-posts-list__listing {
 	list-style: none;
 	margin: 0;

varia/style.css

@@ -1550,7 +1550,7 @@ dd {
 	margin-bottom: 0;
 }
 
-.wp-block-media-text .wp-block-media-text__content a {
+.wp-block-media-text[class*="background-color"]:not(.has-background-background-color) .wp-block-media-text__content a, .wp-block-media-text[style*="background-color"] .wp-block-media-text__content a {
 	color: currentColor;
 }
 
@@ -1569,6 +1569,10 @@ p.has-background {
 	padding: 16px 16px;
 }
 
+p.has-background:not(.has-background-background-color) a {
+	color: currentColor;
+}
+
 .a8c-posts-list__listing {
 	list-style: none;
 	margin: 0;