Merge branch 'master' into update/varia-media-text-paragraph

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} /-->";
 	}
 
 	/**

modern-business/sass/navigation/_menu-footer-navigation.scss

@@ -19,4 +19,16 @@
 		}
 	}
 
+}
+
+footer {
+
+	.wp-block-a8c-navigation-menu {
+
+		.sub-menu {
+			visibility: hidden;
+		}
+
+	}
+
 }

modern-business/sass/navigation/_menu-main-navigation.scss

@@ -139,6 +139,25 @@
 		}
 	}
 
+	.default-menu {
+		> li {
+			> a {
+				margin-right: #{1 * $size__spacing-unit};
+			}
+
+			&.menu-item-has-children {
+				> a {
+					margin-right: #{1 * $size__spacing-unit};
+				}
+			}
+
+			&:last-child > a,
+			&:last-child.menu-item-has-children .submenu-expand {
+				margin-right: 0;
+			}
+		}
+	}
+
 	.sub-menu {
 
 		background-color: $color__link;

modern-business/style-editor.css

@@ -371,6 +371,19 @@ body.page .main-navigation {
   margin-right: 0;
 }
 
+.main-navigation .default-menu > li > a {
+  margin-right: 1rem;
+}
+
+.main-navigation .default-menu > li.menu-item-has-children > a {
+  margin-right: 1rem;
+}
+
+.main-navigation .default-menu > li:last-child > a,
+.main-navigation .default-menu > li:last-child.menu-item-has-children .submenu-expand {
+  margin-right: 0;
+}
+
 .main-navigation .sub-menu {
   background-color: #c43d80;
   color: #fff;

modern-business/style-rtl.css

@@ -1134,6 +1134,19 @@ body.page .main-navigation {
   margin-left: 0;
 }
 
+.main-navigation .default-menu > li > a {
+  margin-left: 1rem;
+}
+
+.main-navigation .default-menu > li.menu-item-has-children > a {
+  margin-left: 1rem;
+}
+
+.main-navigation .default-menu > li:last-child > a,
+.main-navigation .default-menu > li:last-child.menu-item-has-children .submenu-expand {
+  margin-left: 0;
+}
+
 .main-navigation .sub-menu {
   background-color: #c43d80;
   color: #fff;
@@ -1583,6 +1596,10 @@ body.page .main-navigation {
   margin-left: 1rem;
 }
 
+footer .wp-block-a8c-navigation-menu .sub-menu {
+  visibility: hidden;
+}
+
 /*--------------------------------------------------------------
 ## Next / Previous
 --------------------------------------------------------------*/

modern-business/style.css

@@ -1134,6 +1134,19 @@ body.page .main-navigation {
   margin-right: 0;
 }
 
+.main-navigation .default-menu > li > a {
+  margin-right: 1rem;
+}
+
+.main-navigation .default-menu > li.menu-item-has-children > a {
+  margin-right: 1rem;
+}
+
+.main-navigation .default-menu > li:last-child > a,
+.main-navigation .default-menu > li:last-child.menu-item-has-children .submenu-expand {
+  margin-right: 0;
+}
+
 .main-navigation .sub-menu {
   background-color: #c43d80;
   color: #fff;
@@ -1583,6 +1596,10 @@ body.page .main-navigation {
   margin-right: 1rem;
 }
 
+footer .wp-block-a8c-navigation-menu .sub-menu {
+  visibility: hidden;
+}
+
 /*--------------------------------------------------------------
 ## Next / Previous
 --------------------------------------------------------------*/

redhill/style-rtl.css

@@ -1412,9 +1412,10 @@ h6, .h6 {
 }
 
 img {
-	width: auto;
-	vertical-align: middle;
+	height: auto;
 	max-width: 100%;
+	vertical-align: middle;
+	width: auto;
 }
 
 .wp-block-latest-comments {

redhill/style.css

@@ -1412,9 +1412,10 @@ h6, .h6 {
 }
 
 img {
-	width: auto;
-	vertical-align: middle;
+	height: auto;
 	max-width: 100%;
+	vertical-align: middle;
+	width: auto;
 }
 
 .wp-block-latest-comments {

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/image/_style.scss

@@ -11,7 +11,8 @@
 }
 
 img {
-	width: auto;
-	vertical-align: middle;
+	height: auto;
 	max-width: 100%;
+	vertical-align: middle;
+	width: auto;
 }

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;

varia/style-rtl.css

@@ -1371,9 +1371,10 @@ h6, .h6 {
 }
 
 img {
-	width: auto;
-	vertical-align: middle;
+	height: auto;
 	max-width: 100%;
+	vertical-align: middle;
+	width: auto;
 }
 
 .wp-block-latest-comments {

varia/style.css

@@ -1371,9 +1371,10 @@ h6, .h6 {
 }
 
 img {
-	width: auto;
-	vertical-align: middle;
+	height: auto;
 	max-width: 100%;
+	vertical-align: middle;
+	width: auto;
 }
 
 .wp-block-latest-comments {