Merge branch 'master' into 747-h1_size_fixes

* master:
  Friendly Business: Fix margins between columns block.
  Professional Business: Fix margins between columns block
  Sophisticated Business: Revise columns block spacing math
  Modern Business: Code tidying for columns spacing commit
  Elegant Business: Fix margins between columns block
  Calm Business: Fix margins between columns block
  Modern Business: Fix margins between columns block
  Sophisticated Business: Fix margins between columns block

# Conflicts:
#	friendly-business/style.css
#	modern-business/style.css

calm-business/sass/blocks/_blocks.scss

@@ -745,27 +745,27 @@
 
 		@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 {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

calm-business/style-rtl.css

@@ -4246,22 +4246,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

calm-business/style.css

@@ -3158,6 +3158,16 @@ a {
     flex-wrap: nowrap; } }
 
 @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 {
     margin-top: 0; }
   .entry .entry-content .wp-block-columns .wp-block-column > *:last-child {

elegant-business/sass/blocks/_blocks.scss

@@ -814,28 +814,34 @@
 			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 > * {
 
 				&:first-child {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

elegant-business/style-rtl.css

@@ -4211,22 +4211,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

elegant-business/style.css

@@ -3135,10 +3135,25 @@ a {
   padding-left: 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;
+  }
+  .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;
+  }
+}
+
 @media only screen and (min-width: 782px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0; }
   .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;

friendly-business/sass/blocks/_blocks.scss

@@ -839,28 +839,29 @@
 		}
 
 		@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 {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

friendly-business/style-rtl.css

@@ -4194,22 +4194,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

friendly-business/style.css

@@ -3081,17 +3081,17 @@ a {
     flex-wrap: nowrap; } }
 
 @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 {
     margin-top: 0; }
   .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; }
-    .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 {
     padding-left: calc(2 * 1rem);
     padding-right: calc(2 * 1rem); } }

modern-business/sass/blocks/_blocks.scss

@@ -846,27 +846,28 @@
 		}
 
 		@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 {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

modern-business/style-rtl.css

@@ -4255,22 +4255,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);

modern-business/style.css

@@ -3134,17 +3134,17 @@ a {
     flex-wrap: nowrap; } }
 
 @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 {
     margin-top: 0; }
   .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; }
-    .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 {
     padding-left: calc( 2 * 1rem);
     padding-right: calc( 2 * 1rem); } }

professional-business/sass/blocks/_blocks.scss

@@ -820,27 +820,31 @@
 		}
 
 		@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 {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

professional-business/style-rtl.css

@@ -3447,14 +3447,6 @@ body.page .main-navigation {
   }
 }
 
-@media only screen and (min-width: 768px) {
-  .entry .entry-content > *.aligncenter,
-  .entry .entry-summary > *.aligncenter {
-    margin-right: 0;
-    margin-left: 0;
-  }
-}
-
 /*
  * Unset nested content selector styles
  * - Prevents layout styles from cascading too deeply
@@ -4247,22 +4239,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc( 2 * 1rem);
     padding-left: calc( 2 * 1rem);

professional-business/style.css

@@ -3128,11 +3128,24 @@ a {
   padding-left: 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;
+  }
+  .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;
+  }
+}
 @media only screen and (min-width: 782px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0; }
   .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; }

sophisticated-business/sass/blocks/_blocks.scss

@@ -840,27 +840,28 @@
 		}
 
 		@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 {
-					margin-top: 0;
+					margin-left: 0;
 				}
 
 				&: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 {
-					margin-left: 0;
+					margin-top: 0;
 				}
 
 				&:last-child {
-					margin-right: 0;
+					margin-bottom: 0;
 				}
 			}
 

sophisticated-business/style-rtl.css

@@ -4240,22 +4240,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-right: calc(2 * 1rem);
     padding-left: calc(2 * 1rem);

sophisticated-business/style.css

@@ -4222,22 +4222,22 @@ body.page .main-navigation {
 }
 
 @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 {
     margin-top: 0;
   }
   .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;
-  }
-  .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 {
     padding-left: calc(2 * 1rem);
     padding-right: calc(2 * 1rem);