Browse Source

Merge branch 'master' into fix/issue-803

Allan Cole 6 years ago
parent
commit
92e5ce2bc2

+ 8 - 8
calm-business/sass/blocks/_blocks.scss

@@ -740,27 +740,27 @@
 
 
 		@include media(tablet) {
 		@include media(tablet) {
 
 
-			.wp-block-column > * {
+			.wp-block-column {
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 2 - 2
calm-business/sass/typography/_headings.scss

@@ -65,10 +65,10 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-	font-size: $font__size-xl;
+	font-size: $font__size-lg;
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		font-size: $font__size-xxl;
+		font-size: $font__size-xl;
 	}
 	}
 }
 }
 
 

+ 2 - 2
calm-business/style-editor.css

@@ -99,11 +99,11 @@ h2 {
 }
 }
 
 
 h3 {
 h3 {
-  font-size: 22px;
+  font-size: 1.125em;
 }
 }
 
 
 h4 {
 h4 {
-  font-size: 1.125em;
+  font-size: 22px;
 }
 }
 
 
 h5 {
 h5 {

+ 2 - 2
calm-business/style-editor.scss

@@ -102,11 +102,11 @@ h2 {
 }
 }
 
 
 h3 {
 h3 {
-	font-size: $font__size-base;
+	font-size: $font__size-md;
 }
 }
 
 
 h4 {
 h4 {
-	font-size: $font__size-md;
+	font-size: $font__size-base;
 }
 }
 
 
 h5 {
 h5 {

+ 12 - 12
calm-business/style-rtl.css

@@ -490,12 +490,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 
@@ -4243,22 +4243,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-right: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-left: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-right: 1rem;
-    margin-left: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-right: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-left: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

+ 12 - 12
calm-business/style.css

@@ -490,12 +490,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 
@@ -4255,22 +4255,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-left: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-right: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);

+ 14 - 8
elegant-business/sass/blocks/_blocks.scss

@@ -803,28 +803,34 @@
 			padding-right: $size__spacing-unit;
 			padding-right: $size__spacing-unit;
 		}
 		}
 
 
-		@include media(tabletalt) {
+		@include media(tablet) {
+
+			.wp-block-column {
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
+      }
+    }
+    
+    @include media(tabletalt) {
 			.wp-block-column > * {
 			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 13 - 10
elegant-business/style-rtl.css

@@ -4201,22 +4201,25 @@ body.page .main-navigation {
   padding-left: 1rem;
   padding-left: 1rem;
 }
 }
 
 
+@media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+}
+
 @media only screen and (min-width: 782px) {
 @media only screen and (min-width: 782px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
-    margin-top: 0;
+    margin-right: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
-    margin-bottom: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-right: 1rem;
-    margin-left: 1rem;
+    margin-left: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-right: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
+    margin-top: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-left: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
+    margin-bottom: 0;
   }
   }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);

+ 13 - 10
elegant-business/style.css

@@ -4213,22 +4213,25 @@ body.page .main-navigation {
   padding-right: 1rem;
   padding-right: 1rem;
 }
 }
 
 
+@media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
+}
+
 @media only screen and (min-width: 782px) {
 @media only screen and (min-width: 782px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
-    margin-top: 0;
+    margin-left: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
-    margin-bottom: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
+    margin-right: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
+    margin-top: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
+    margin-bottom: 0;
   }
   }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

+ 10 - 9
friendly-business/sass/blocks/_blocks.scss

@@ -837,28 +837,29 @@
 		}
 		}
 
 
 		@include media(tablet) {
 		@include media(tablet) {
-			.wp-block-column > * {
+
+			.wp-block-column {
+
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 2 - 2
friendly-business/sass/typography/_headings.scss

@@ -64,10 +64,10 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-	font-size: $font__size-xl;
+	font-size: $font__size-lg;
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		font-size: $font__size-xxl;
+		font-size: $font__size-xl;
 	}
 	}
 }
 }
 
 

+ 2 - 2
friendly-business/style-editor.css

@@ -98,12 +98,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 

+ 2 - 2
friendly-business/style-editor.scss

@@ -102,10 +102,10 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-	font-size: $font__size-xl;
+	font-size: $font__size-lg;
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		font-size: $font__size-xxl;
+		font-size: $font__size-xl;
 	}
 	}
 }
 }
 
 

+ 12 - 12
friendly-business/style-rtl.css

@@ -489,12 +489,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 
@@ -4160,22 +4160,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-right: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-left: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-right: 1rem;
-    margin-left: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-right: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-left: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

+ 12 - 12
friendly-business/style.css

@@ -489,12 +489,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 
@@ -4172,22 +4172,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-left: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-right: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);

+ 9 - 8
modern-business/sass/blocks/_blocks.scss

@@ -850,27 +850,28 @@
 		}
 		}
 
 
 		@include media(tablet) {
 		@include media(tablet) {
-			.wp-block-column > * {
+
+			.wp-block-column {
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 2 - 2
modern-business/style-editor.css

@@ -94,12 +94,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 

+ 2 - 2
modern-business/style-editor.scss

@@ -94,10 +94,10 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-	font-size: $font__size-xl;
+	font-size: $font__size-lg;
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		font-size: $font__size-xxl;
+		font-size: $font__size-xl;
 	}
 	}
 }
 }
 
 

+ 12 - 10
modern-business/style-rtl.css

@@ -4074,7 +4074,9 @@ body.page .main-navigation {
   }
   }
 }
 }
 
 
+.entry .entry-content .wp-block-cover-image .has-large-font-size,
 .entry .entry-content .wp-block-cover-image h2,
 .entry .entry-content .wp-block-cover-image h2,
+.entry .entry-content .wp-block-cover .has-large-font-size,
 .entry .entry-content .wp-block-cover h2 {
 .entry .entry-content .wp-block-cover h2 {
   max-width: inherit;
   max-width: inherit;
   margin: inherit;
   margin: inherit;
@@ -4277,22 +4279,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-right: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-left: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-right: 1rem;
-    margin-left: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-right: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-left: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-right: calc( 2 * 1rem);
     padding-right: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);

+ 10 - 10
modern-business/style.css

@@ -4291,22 +4291,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-left: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-right: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);
     padding-right: calc( 2 * 1rem);
     padding-right: calc( 2 * 1rem);

+ 12 - 8
professional-business/sass/blocks/_blocks.scss

@@ -820,27 +820,31 @@
 		}
 		}
 
 
 		@include media(tabletalt) {
 		@include media(tabletalt) {
-			.wp-block-column > * {
+
+			.wp-block-column {
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
+      }
+
+      .wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 13 - 0
professional-business/style-rtl.css

@@ -3899,6 +3899,7 @@ body.page .main-navigation {
 .entry .entry-content .wp-block-cover h2 {
 .entry .entry-content .wp-block-cover h2 {
   max-width: inherit;
   max-width: inherit;
   margin: inherit;
   margin: inherit;
+  text-align: inherit;
 }
 }
 
 
 .entry .entry-content .wp-block-cover-image.alignleft, .entry .entry-content .wp-block-cover-image.alignright,
 .entry .entry-content .wp-block-cover-image.alignleft, .entry .entry-content .wp-block-cover-image.alignright,
@@ -4233,6 +4234,18 @@ body.page .main-navigation {
   padding-left: 1rem;
   padding-left: 1rem;
 }
 }
 
 
+@media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-right: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-left: 0;
+  }
+}
 @media only screen and (min-width: 782px) {
 @media only screen and (min-width: 782px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;

+ 10 - 10
professional-business/style.css

@@ -4247,21 +4247,21 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 782px) {
 @media only screen and (min-width: 782px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
-    margin-top: 0;
+    margin-left: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
-    margin-bottom: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
+    margin-right: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
+    margin-top: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
+  .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
+    margin-bottom: 0;
   }
   }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);

+ 9 - 8
sophisticated-business/sass/blocks/_blocks.scss

@@ -830,27 +830,28 @@
 		}
 		}
 
 
 		@include media(tablet) {
 		@include media(tablet) {
-			.wp-block-column > * {
+
+			.wp-block-column {
+				margin-left: #{0.5 * $size__spacing-unit};
+				margin-right: #{0.5 * $size__spacing-unit};
 
 
 				&:first-child {
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-bottom: 0;
+					margin-right: 0;
 				}
 				}
 			}
 			}
 
 
-			&[class*='has-'] > * {
-				margin-left: $size__spacing-unit;
-				margin-right: $size__spacing-unit;
+			.wp-block-column > * {
 
 
 				&:first-child {
 				&:first-child {
-					margin-left: 0;
+					margin-top: 0;
 				}
 				}
 
 
 				&:last-child {
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 				}
 			}
 			}
 
 

+ 2 - 2
sophisticated-business/style-editor.css

@@ -104,12 +104,12 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-  font-size: 2.25em;
+  font-size: 1.6875em;
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   h1 {
   h1 {
-    font-size: 2.8125em;
+    font-size: 2.25em;
   }
   }
 }
 }
 
 

+ 2 - 2
sophisticated-business/style-editor.scss

@@ -109,10 +109,10 @@ h6 {
 }
 }
 
 
 h1 {
 h1 {
-	font-size: $font__size-xl;
+	font-size: $font__size-lg;
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		font-size: $font__size-xxl;
+		font-size: $font__size-xl;
 	}
 	}
 }
 }
 
 

+ 10 - 10
sophisticated-business/style-rtl.css

@@ -4203,22 +4203,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-right: 0.5rem;
+    margin-left: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-right: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-left: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-right: 1rem;
-    margin-left: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-right: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-left: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

+ 10 - 10
sophisticated-business/style.css

@@ -4215,22 +4215,22 @@ body.page .main-navigation {
 }
 }
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-column {
+    margin-left: 0.5rem;
+    margin-right: 0.5rem;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:first-child {
+    margin-left: 0;
+  }
+  .entry .entry-content .wp-block-columns .wp-block-column:last-child {
+    margin-right: 0;
+  }
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
     margin-top: 0;
   }
   }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .entry .entry-content .wp-block-columns[class*='has-'] > * {
-    margin-left: 1rem;
-    margin-right: 1rem;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:first-child {
-    margin-left: 0;
-  }
-  .entry .entry-content .wp-block-columns[class*='has-'] > *:last-child {
-    margin-right: 0;
-  }
   .entry .entry-content .wp-block-columns.alignfull {
   .entry .entry-content .wp-block-columns.alignfull {
     padding-left: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);