Browse Source

Modern Business: Adds 32px veritcal spacing unit and adds it to block wrappers, Also fixes a build tool vulnerability

- Fixes #745
Allan Cole 6 năm trước cách đây
mục cha
commit
c8cf0a476e

+ 42 - 70
modern-business/package-lock.json

@@ -339,15 +339,6 @@
       "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
       "integrity": "sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==",
       "dev": true
       "dev": true
     },
     },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.0"
-      }
-    },
     "bluebird": {
     "bluebird": {
       "version": "3.5.3",
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
@@ -441,7 +432,7 @@
     },
     },
     "camelcase-keys": {
     "camelcase-keys": {
       "version": "2.1.0",
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
@@ -2997,9 +2988,9 @@
       "dev": true
       "dev": true
     },
     },
     "js-yaml": {
     "js-yaml": {
-      "version": "3.12.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
-      "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "argparse": "^1.0.7",
         "argparse": "^1.0.7",
@@ -3080,7 +3071,7 @@
     },
     },
     "load-json-file": {
     "load-json-file": {
       "version": "1.1.0",
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
@@ -3115,24 +3106,6 @@
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
       "dev": true
       "dev": true
     },
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
-    },
-    "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-      "dev": true
-    },
     "log-symbols": {
     "log-symbols": {
       "version": "2.2.0",
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -3211,7 +3184,7 @@
     },
     },
     "meow": {
     "meow": {
       "version": "3.7.0",
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
@@ -3255,18 +3228,18 @@
       }
       }
     },
     },
     "mime-db": {
     "mime-db": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
       "dev": true
       "dev": true
     },
     },
     "mime-types": {
     "mime-types": {
-      "version": "2.1.22",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
-        "mime-db": "~1.38.0"
+        "mime-db": "1.40.0"
       }
       }
     },
     },
     "mimic-fn": {
     "mimic-fn": {
@@ -3286,7 +3259,7 @@
     },
     },
     "minimist": {
     "minimist": {
       "version": "1.2.0",
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
       "dev": true
     },
     },
@@ -3315,7 +3288,6 @@
       "version": "0.5.1",
       "version": "0.5.1",
       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
       "requires": {
         "minimist": "0.0.8"
         "minimist": "0.0.8"
       },
       },
@@ -3323,8 +3295,7 @@
         "minimist": {
         "minimist": {
           "version": "0.0.8",
           "version": "0.0.8",
           "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
         }
       }
       }
     },
     },
@@ -3338,7 +3309,8 @@
       "version": "2.11.0",
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     },
     "nanomatch": {
     "nanomatch": {
       "version": "1.2.13",
       "version": "1.2.13",
@@ -3381,15 +3353,23 @@
         "request": "^2.87.0",
         "request": "^2.87.0",
         "rimraf": "2",
         "rimraf": "2",
         "semver": "~5.3.0",
         "semver": "~5.3.0",
-        "tar": "^2.0.0",
         "which": "1"
         "which": "1"
       },
       },
       "dependencies": {
       "dependencies": {
         "semver": {
         "semver": {
           "version": "5.3.0",
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
           "dev": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+          "requires": {
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2"
+          }
         }
         }
       }
       }
     },
     },
@@ -3403,9 +3383,9 @@
       }
       }
     },
     },
     "node-sass": {
     "node-sass": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "async-foreach": "^0.1.3",
         "async-foreach": "^0.1.3",
@@ -3415,12 +3395,10 @@
         "get-stdin": "^4.0.1",
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
         "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
+        "lodash": "^4.17.11",
         "meow": "^3.7.0",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
         "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
+        "nan": "^2.13.2",
         "node-gyp": "^3.8.0",
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
         "request": "^2.88.0",
@@ -3437,7 +3415,7 @@
         },
         },
         "chalk": {
         "chalk": {
           "version": "1.1.3",
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "dev": true,
           "requires": {
           "requires": {
@@ -3448,6 +3426,12 @@
             "supports-color": "^2.0.0"
             "supports-color": "^2.0.0"
           }
           }
         },
         },
+        "nan": {
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==",
+          "dev": true
+        },
         "supports-color": {
         "supports-color": {
           "version": "2.0.0",
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -3695,7 +3679,7 @@
     },
     },
     "os-locale": {
     "os-locale": {
       "version": "1.4.0",
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
@@ -4073,7 +4057,7 @@
     },
     },
     "pretty-hrtime": {
     "pretty-hrtime": {
       "version": "1.0.3",
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
       "dev": true
     },
     },
@@ -4322,8 +4306,7 @@
     "safe-buffer": {
     "safe-buffer": {
       "version": "5.1.2",
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     },
     "safe-regex": {
     "safe-regex": {
       "version": "1.1.0",
       "version": "1.1.0",
@@ -4758,17 +4741,6 @@
         "has-flag": "^3.0.0"
         "has-flag": "^3.0.0"
       }
       }
     },
     },
-    "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "dev": true,
-      "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
-      }
-    },
     "to-object-path": {
     "to-object-path": {
       "version": "0.3.0",
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",

+ 17 - 17
modern-business/sass/blocks/_blocks.scss

@@ -2,13 +2,13 @@
 
 
 .entry .entry-content > *,
 .entry .entry-content > *,
 .entry .entry-summary > * {
 .entry .entry-summary > * {
-	margin: 32px 0;
+	margin: $size__vertical-spacing-unit 0;
 	max-width: 100%;
 	max-width: 100%;
 
 
 	@include postContentMaxWidth();
 	@include postContentMaxWidth();
 
 
 	@include media(tablet) {
 	@include media(tablet) {
-		margin: 32px auto;
+		margin: $size__vertical-spacing-unit auto;
 	}
 	}
 
 
 	> *:first-child {
 	> *:first-child {
@@ -38,8 +38,8 @@
 		clear: both;
 		clear: both;
 
 
 		@include media(tablet) {
 		@include media(tablet) {
-			margin-top: calc(2 * #{$size__spacing-unit});
-			margin-bottom: calc(2 * #{$size__spacing-unit});
+			margin-top: calc(2 * #{$size__vertical-spacing-unit});
+			margin-bottom: calc(2 * #{$size__vertical-spacing-unit});
 			left: calc( -12.5% - 75px );
 			left: calc( -12.5% - 75px );
 			width: calc( 125% + 150px );
 			width: calc( 125% + 150px );
 			max-width: calc( 125% + 150px );
 			max-width: calc( 125% + 150px );
@@ -125,7 +125,7 @@
 	& > h4,
 	& > h4,
 	& > h5,
 	& > h5,
 	& > h6 {
 	& > h6 {
-		margin: 2rem auto;
+		margin: #{2 * $size__vertical-spacing-unit} auto;
 		text-align: center;
 		text-align: center;
 	}
 	}
 
 
@@ -200,7 +200,7 @@
 		}
 		}
 
 
 		@include media(tablet) {
 		@include media(tablet) {
-			padding: 60px 0;
+			padding: #{2 * $size__vertical-spacing-unit} 0;
 
 
 			.wp-block-media-text__media {
 			.wp-block-media-text__media {
 				margin-left: -60px;
 				margin-left: -60px;
@@ -359,7 +359,7 @@
 			font-size: calc(#{$font__size_base} * #{$font__size-ratio});
 			font-size: calc(#{$font__size_base} * #{$font__size-ratio});
 			font-weight: bold;
 			font-weight: bold;
 			line-height: $font__line-height-heading;
 			line-height: $font__line-height-heading;
-			padding-bottom: ( .75 * $size__spacing-unit );
+			padding-bottom: #{ .75 * $size__vertical-spacing-unit };
 
 
 			&.menu-item-has-children,
 			&.menu-item-has-children,
 			&:last-child {
 			&:last-child {
@@ -384,7 +384,7 @@
 	.wp-block-categories {
 	.wp-block-categories {
 
 
 		ul {
 		ul {
-			padding-top: ( .75 * $size__spacing-unit );
+			padding-top: #{ .75 * $size__vertical-spacing-unit };
 		}
 		}
 
 
 		li ul {
 		li ul {
@@ -399,8 +399,8 @@
 	.wp-block-latest-posts.is-grid {
 	.wp-block-latest-posts.is-grid {
 		li {
 		li {
 			border-top: 2px solid $color__border;
 			border-top: 2px solid $color__border;
-			padding-top: (1 * $size__spacing-unit);
-			margin-bottom: (2 * $size__spacing-unit);
+			padding-top: #{1 * $size__spacing-unit};
+			margin-bottom: #{2 * $size__vertical-spacing-unit};
 			a {
 			a {
 				&:after {
 				&:after {
 					content: '';
 					content: '';
@@ -449,8 +449,8 @@
 		blockquote {
 		blockquote {
 			color: $color__text-main;
 			color: $color__text-main;
 			border: none;
 			border: none;
-			margin-top: calc(4 * #{ $size__spacing-unit});
-			margin-bottom: calc(4.33 * #{ $size__spacing-unit});
+			margin-top: calc(3 * #{ $size__vertical-spacing-unit});
+			margin-bottom: calc(3.33 * #{ $size__vertical-spacing-unit});
 			margin-right: 0;
 			margin-right: 0;
 			padding-left: 0;
 			padding-left: 0;
 		}
 		}
@@ -491,7 +491,7 @@
 			padding: 0;
 			padding: 0;
 
 
 			blockquote {
 			blockquote {
-				margin: $size__spacing-unit 0;
+				margin: $size__vertical-spacing-unit 0;
 				padding: 0;
 				padding: 0;
 				text-align: left;
 				text-align: left;
 				max-width: 100%;
 				max-width: 100%;
@@ -599,7 +599,7 @@
 
 
 		&.is-large,
 		&.is-large,
 		&.is-style-large {
 		&.is-style-large {
-			margin: $size__spacing-unit auto;
+			margin: $size__vertical-spacing-unit auto;
 			padding: 0;
 			padding: 0;
 			border-left: none;
 			border-left: none;
 
 
@@ -619,7 +619,7 @@
 			}
 			}
 
 
 			@include media(tablet) {
 			@include media(tablet) {
-				margin: $size__spacing-unit auto;
+				margin: $size__vertical-spacing-unit auto;
 				padding: $size__spacing-unit 0;
 				padding: $size__spacing-unit 0;
 
 
 				p {
 				p {
@@ -762,7 +762,7 @@
 		background-color: $color__text-light;
 		background-color: $color__text-light;
 		border: 0;
 		border: 0;
 		height: 1px;
 		height: 1px;
-		margin: (2 * $size__spacing-unit) auto;
+		margin: (2 * $size__vertical-spacing-unit) auto;
 		max-width: 5em;
 		max-width: 5em;
 		text-align: left;
 		text-align: left;
 
 
@@ -828,7 +828,7 @@
 			padding: ($size__spacing-unit * .75) $size__spacing-unit;
 			padding: ($size__spacing-unit * .75) $size__spacing-unit;
 			color: #fff;
 			color: #fff;
 			margin-left: 0;
 			margin-left: 0;
-			margin-top: calc(0.75 * #{$size__spacing-unit});
+			margin-top: calc(0.75 * #{$size__vertical-spacing-unit});
 
 
 			@include media(desktop) {
 			@include media(desktop) {
 				font-size: $font__size-base;
 				font-size: $font__size-base;

+ 1 - 1
modern-business/sass/site/primary/_posts-and-pages.scss

@@ -231,7 +231,7 @@
 		// Overwrite iframe embeds that have inline styles.
 		// Overwrite iframe embeds that have inline styles.
 		> iframe[style] {
 		> iframe[style] {
 
 
-			margin: 32px 0 !important;
+			margin: $size__vertical-spacing-unit 0 !important;
 			max-width: 100% !important;
 			max-width: 100% !important;
 
 
 			@include media(tablet) {
 			@include media(tablet) {

+ 1 - 0
modern-business/sass/variables-site/_structure.scss

@@ -1,6 +1,7 @@
 // Responsive widths.
 // Responsive widths.
 
 
 $size__spacing-unit: 1rem;
 $size__spacing-unit: 1rem;
+$size__vertical-spacing-unit: 32px;
 $size__site-main: 100%;
 $size__site-main: 100%;
 $size__site-sidebar: 25%;
 $size__site-sidebar: 25%;
 $size__site-margins: calc(10% + 60px);
 $size__site-margins: calc(10% + 60px);

+ 14 - 14
modern-business/style-rtl.css

@@ -3403,8 +3403,8 @@ body.page .main-navigation {
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content > *.alignfull,
   .entry .entry-content > *.alignfull,
   .entry .entry-summary > *.alignfull {
   .entry .entry-summary > *.alignfull {
-    margin-top: calc(2 * 1rem);
-    margin-bottom: calc(2 * 1rem);
+    margin-top: calc(2 * 32px);
+    margin-bottom: calc(2 * 32px);
     right: calc( -12.5% - 75px);
     right: calc( -12.5% - 75px);
     width: calc( 125% + 150px);
     width: calc( 125% + 150px);
     max-width: calc( 125% + 150px);
     max-width: calc( 125% + 150px);
@@ -3507,7 +3507,7 @@ body.page .main-navigation {
 .entry .entry-content > h4,
 .entry .entry-content > h4,
 .entry .entry-content > h5,
 .entry .entry-content > h5,
 .entry .entry-content > h6 {
 .entry .entry-content > h6 {
-  margin: 2rem auto;
+  margin: 64px auto;
   text-align: center;
   text-align: center;
 }
 }
 
 
@@ -3586,7 +3586,7 @@ body.page .main-navigation {
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-media-text {
   .entry .entry-content .wp-block-media-text {
-    padding: 60px 0;
+    padding: 64px 0;
   }
   }
   .entry .entry-content .wp-block-media-text .wp-block-media-text__media {
   .entry .entry-content .wp-block-media-text .wp-block-media-text__media {
     margin-right: -60px;
     margin-right: -60px;
@@ -3734,7 +3734,7 @@ body.page .main-navigation {
   font-size: calc(22px * 1.125);
   font-size: calc(22px * 1.125);
   font-weight: bold;
   font-weight: bold;
   line-height: 1.2;
   line-height: 1.2;
-  padding-bottom: 0.75rem;
+  padding-bottom: 24px;
 }
 }
 
 
 .entry .entry-content .wp-block-archives li.menu-item-has-children, .entry .entry-content .wp-block-archives li:last-child,
 .entry .entry-content .wp-block-archives li.menu-item-has-children, .entry .entry-content .wp-block-archives li:last-child,
@@ -3757,7 +3757,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-categories ul {
 .entry .entry-content .wp-block-categories ul {
-  padding-top: 0.75rem;
+  padding-top: 24px;
 }
 }
 
 
 .entry .entry-content .wp-block-categories li ul {
 .entry .entry-content .wp-block-categories li ul {
@@ -3779,7 +3779,7 @@ body.page .main-navigation {
 .entry .entry-content .wp-block-latest-posts.is-grid li {
 .entry .entry-content .wp-block-latest-posts.is-grid li {
   border-top: 2px solid #ccc;
   border-top: 2px solid #ccc;
   padding-top: 1rem;
   padding-top: 1rem;
-  margin-bottom: 2rem;
+  margin-bottom: 64px;
 }
 }
 
 
 .entry .entry-content .wp-block-latest-posts.is-grid li a:after {
 .entry .entry-content .wp-block-latest-posts.is-grid li a:after {
@@ -3823,8 +3823,8 @@ body.page .main-navigation {
 .entry .entry-content .wp-block-pullquote blockquote {
 .entry .entry-content .wp-block-pullquote blockquote {
   color: #181818;
   color: #181818;
   border: none;
   border: none;
-  margin-top: calc(4 * 1rem);
-  margin-bottom: calc(4.33 * 1rem);
+  margin-top: calc(3 * 32px);
+  margin-bottom: calc(3.33 * 32px);
   margin-left: 0;
   margin-left: 0;
   padding-right: 0;
   padding-right: 0;
 }
 }
@@ -3866,7 +3866,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
-  margin: 1rem 0;
+  margin: 32px 0;
   padding: 0;
   padding: 0;
   text-align: right;
   text-align: right;
   max-width: 100%;
   max-width: 100%;
@@ -3965,7 +3965,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
 .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
-  margin: 1rem auto;
+  margin: 32px auto;
   padding: 0;
   padding: 0;
   border-right: none;
   border-right: none;
 }
 }
@@ -3988,7 +3988,7 @@ body.page .main-navigation {
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
   .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
-    margin: 1rem auto;
+    margin: 32px auto;
     padding: 1rem 0;
     padding: 1rem 0;
   }
   }
   .entry .entry-content .wp-block-quote.is-large p, .entry .entry-content .wp-block-quote.is-style-large p {
   .entry .entry-content .wp-block-quote.is-large p, .entry .entry-content .wp-block-quote.is-style-large p {
@@ -4154,7 +4154,7 @@ body.page .main-navigation {
   background-color: #686868;
   background-color: #686868;
   border: 0;
   border: 0;
   height: 1px;
   height: 1px;
-  margin: 2rem auto;
+  margin: 64px auto;
   max-width: 5em;
   max-width: 5em;
   text-align: right;
   text-align: right;
   /* Remove duplicate rule-line when a separator
   /* Remove duplicate rule-line when a separator
@@ -4243,7 +4243,7 @@ body.page .main-navigation {
   padding: 0.75rem 1rem;
   padding: 0.75rem 1rem;
   color: #fff;
   color: #fff;
   margin-right: 0;
   margin-right: 0;
-  margin-top: calc(0.75 * 1rem);
+  margin-top: calc(0.75 * 32px);
 }
 }
 
 
 @media only screen and (min-width: 1168px) {
 @media only screen and (min-width: 1168px) {

+ 14 - 14
modern-business/style.css

@@ -3409,8 +3409,8 @@ body.page .main-navigation {
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content > *.alignfull,
   .entry .entry-content > *.alignfull,
   .entry .entry-summary > *.alignfull {
   .entry .entry-summary > *.alignfull {
-    margin-top: calc(2 * 1rem);
-    margin-bottom: calc(2 * 1rem);
+    margin-top: calc(2 * 32px);
+    margin-bottom: calc(2 * 32px);
     left: calc( -12.5% - 75px);
     left: calc( -12.5% - 75px);
     width: calc( 125% + 150px);
     width: calc( 125% + 150px);
     max-width: calc( 125% + 150px);
     max-width: calc( 125% + 150px);
@@ -3519,7 +3519,7 @@ body.page .main-navigation {
 .entry .entry-content > h4,
 .entry .entry-content > h4,
 .entry .entry-content > h5,
 .entry .entry-content > h5,
 .entry .entry-content > h6 {
 .entry .entry-content > h6 {
-  margin: 2rem auto;
+  margin: 64px auto;
   text-align: center;
   text-align: center;
 }
 }
 
 
@@ -3598,7 +3598,7 @@ body.page .main-navigation {
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-media-text {
   .entry .entry-content .wp-block-media-text {
-    padding: 60px 0;
+    padding: 64px 0;
   }
   }
   .entry .entry-content .wp-block-media-text .wp-block-media-text__media {
   .entry .entry-content .wp-block-media-text .wp-block-media-text__media {
     margin-left: -60px;
     margin-left: -60px;
@@ -3746,7 +3746,7 @@ body.page .main-navigation {
   font-size: calc(22px * 1.125);
   font-size: calc(22px * 1.125);
   font-weight: bold;
   font-weight: bold;
   line-height: 1.2;
   line-height: 1.2;
-  padding-bottom: 0.75rem;
+  padding-bottom: 24px;
 }
 }
 
 
 .entry .entry-content .wp-block-archives li.menu-item-has-children, .entry .entry-content .wp-block-archives li:last-child,
 .entry .entry-content .wp-block-archives li.menu-item-has-children, .entry .entry-content .wp-block-archives li:last-child,
@@ -3769,7 +3769,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-categories ul {
 .entry .entry-content .wp-block-categories ul {
-  padding-top: 0.75rem;
+  padding-top: 24px;
 }
 }
 
 
 .entry .entry-content .wp-block-categories li ul {
 .entry .entry-content .wp-block-categories li ul {
@@ -3791,7 +3791,7 @@ body.page .main-navigation {
 .entry .entry-content .wp-block-latest-posts.is-grid li {
 .entry .entry-content .wp-block-latest-posts.is-grid li {
   border-top: 2px solid #ccc;
   border-top: 2px solid #ccc;
   padding-top: 1rem;
   padding-top: 1rem;
-  margin-bottom: 2rem;
+  margin-bottom: 64px;
 }
 }
 
 
 .entry .entry-content .wp-block-latest-posts.is-grid li a:after {
 .entry .entry-content .wp-block-latest-posts.is-grid li a:after {
@@ -3835,8 +3835,8 @@ body.page .main-navigation {
 .entry .entry-content .wp-block-pullquote blockquote {
 .entry .entry-content .wp-block-pullquote blockquote {
   color: #181818;
   color: #181818;
   border: none;
   border: none;
-  margin-top: calc(4 * 1rem);
-  margin-bottom: calc(4.33 * 1rem);
+  margin-top: calc(3 * 32px);
+  margin-bottom: calc(3.33 * 32px);
   margin-right: 0;
   margin-right: 0;
   padding-left: 0;
   padding-left: 0;
 }
 }
@@ -3878,7 +3878,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
-  margin: 1rem 0;
+  margin: 32px 0;
   padding: 0;
   padding: 0;
   text-align: left;
   text-align: left;
   max-width: 100%;
   max-width: 100%;
@@ -3977,7 +3977,7 @@ body.page .main-navigation {
 }
 }
 
 
 .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
 .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
-  margin: 1rem auto;
+  margin: 32px auto;
   padding: 0;
   padding: 0;
   border-left: none;
   border-left: none;
 }
 }
@@ -4000,7 +4000,7 @@ body.page .main-navigation {
 
 
 @media only screen and (min-width: 768px) {
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
   .entry .entry-content .wp-block-quote.is-large, .entry .entry-content .wp-block-quote.is-style-large {
-    margin: 1rem auto;
+    margin: 32px auto;
     padding: 1rem 0;
     padding: 1rem 0;
   }
   }
   .entry .entry-content .wp-block-quote.is-large p, .entry .entry-content .wp-block-quote.is-style-large p {
   .entry .entry-content .wp-block-quote.is-large p, .entry .entry-content .wp-block-quote.is-style-large p {
@@ -4166,7 +4166,7 @@ body.page .main-navigation {
   background-color: #686868;
   background-color: #686868;
   border: 0;
   border: 0;
   height: 1px;
   height: 1px;
-  margin: 2rem auto;
+  margin: 64px auto;
   max-width: 5em;
   max-width: 5em;
   text-align: left;
   text-align: left;
   /* Remove duplicate rule-line when a separator
   /* Remove duplicate rule-line when a separator
@@ -4255,7 +4255,7 @@ body.page .main-navigation {
   padding: 0.75rem 1rem;
   padding: 0.75rem 1rem;
   color: #fff;
   color: #fff;
   margin-left: 0;
   margin-left: 0;
-  margin-top: calc(0.75 * 1rem);
+  margin-top: calc(0.75 * 32px);
 }
 }
 
 
 @media only screen and (min-width: 1168px) {
 @media only screen and (min-width: 1168px) {