浏览代码

Merge branch 'master' into try/seedlet/color-annotations

Kjell Reigstad 5 年之前
父节点
当前提交
c98e957be0
共有 100 个文件被更改,包括 888 次插入329 次删除
  1. 16 48
      alves/inc/wpcom-colors.php
  2. 1 1
      alves/sass/_config-child-theme-deep.scss
  3. 6 0
      alves/sass/style-child-theme-editor.scss
  4. 15 0
      alves/style-editor.css
  5. 2 2
      alves/style-rtl.css
  6. 2 2
      alves/style.css
  7. 1 1
      balasana/sass/_config-child-theme-deep.scss
  8. 6 0
      balasana/sass/style-child-theme-editor.scss
  9. 15 0
      balasana/style-editor.css
  10. 2 2
      balasana/style-rtl.css
  11. 2 2
      balasana/style.css
  12. 1 1
      barnsbury/sass/_config-child-theme-deep.scss
  13. 5 0
      barnsbury/sass/style-child-theme-editor.scss
  14. 15 0
      barnsbury/style-editor.css
  15. 2 2
      barnsbury/style-rtl.css
  16. 2 2
      barnsbury/style.css
  17. 1 1
      brompton/sass/_config-child-theme-deep.scss
  18. 6 0
      brompton/sass/style-child-theme-editor.scss
  19. 15 0
      brompton/style-editor.css
  20. 2 2
      brompton/style-rtl.css
  21. 2 2
      brompton/style.css
  22. 2 2
      canard/js/single-thumbnail.js
  23. 1 33
      coutoire/inc/wpcom-colors.php
  24. 1 1
      coutoire/sass/_config-child-theme-deep.scss
  25. 6 0
      coutoire/sass/style-child-theme-editor.scss
  26. 15 0
      coutoire/style-editor.css
  27. 2 2
      coutoire/style-rtl.css
  28. 2 2
      coutoire/style.css
  29. 1 1
      dalston/sass/_config-child-theme-deep.scss
  30. 6 0
      dalston/sass/style-child-theme-editor.scss
  31. 15 0
      dalston/style-editor.css
  32. 2 2
      dalston/style-rtl.css
  33. 2 2
      dalston/style.css
  34. 1 1
      exford/sass/_config-child-theme-deep.scss
  35. 6 0
      exford/sass/style-child-theme-editor.scss
  36. 15 0
      exford/style-editor.css
  37. 2 2
      exford/style-rtl.css
  38. 2 2
      exford/style.css
  39. 1 1
      hever/sass/_config-child-theme-deep.scss
  40. 6 0
      hever/sass/style-child-theme-editor.scss
  41. 15 0
      hever/style-editor.css
  42. 2 2
      hever/style-rtl.css
  43. 2 2
      hever/style.css
  44. 1 1
      leven/sass/_config-child-theme-deep.scss
  45. 6 0
      leven/sass/style-child-theme-editor.scss
  46. 15 0
      leven/style-editor.css
  47. 2 2
      leven/style-rtl.css
  48. 2 2
      leven/style.css
  49. 1 1
      mayland/sass/_config-child-theme-deep.scss
  50. 6 0
      mayland/sass/style-child-theme-editor.scss
  51. 15 0
      mayland/style-editor.css
  52. 2 2
      mayland/style-rtl.css
  53. 2 2
      mayland/style.css
  54. 1 1
      maywood/sass/_config-child-theme-deep.scss
  55. 6 0
      maywood/sass/style-child-theme-editor.scss
  56. 15 0
      maywood/style-editor.css
  57. 2 2
      maywood/style-rtl.css
  58. 2 2
      maywood/style.css
  59. 1 1
      morden/sass/_config-child-theme-deep.scss
  60. 6 0
      morden/sass/style-child-theme-editor.scss
  61. 15 0
      morden/style-editor.css
  62. 2 2
      morden/style-rtl.css
  63. 2 2
      morden/style.css
  64. 1 1
      redhill/sass/_config-child-theme-deep.scss
  65. 6 0
      redhill/sass/style-child-theme-editor.scss
  66. 15 0
      redhill/style-editor.css
  67. 2 2
      redhill/style-rtl.css
  68. 2 2
      redhill/style.css
  69. 10 0
      rivington/functions.php
  70. 22 36
      rivington/inc/wpcom-colors.php
  71. 1 1
      rivington/sass/_config-child-theme-deep.scss
  72. 6 0
      rivington/sass/style-child-theme-editor.scss
  73. 15 0
      rivington/style-editor.css
  74. 2 2
      rivington/style-rtl.css
  75. 2 2
      rivington/style.css
  76. 1 1
      rockfield/sass/_config-child-theme-deep.scss
  77. 6 0
      rockfield/sass/style-child-theme-editor.scss
  78. 15 0
      rockfield/style-editor.css
  79. 2 2
      rockfield/style-rtl.css
  80. 2 2
      rockfield/style.css
  81. 9 1
      seedlet-blocks/block-template-parts/footer.html
  82. 9 1
      seedlet-blocks/block-template-parts/header.html
  83. 0 11
      seedlet-blocks/block-templates/home.html
  84. 9 5
      seedlet-blocks/block-templates/index.html
  85. 4 4
      seedlet-blocks/block-templates/singular.html
  86. 6 1
      seedlet-blocks/style-editor.css
  87. 5 0
      seedlet/assets/css/custom-color-overrides.css
  88. 112 84
      seedlet/assets/css/ie.css
  89. 139 8
      seedlet/assets/css/style-editor.css
  90. 3 3
      seedlet/assets/sass/abstracts/_config.scss
  91. 14 2
      seedlet/assets/sass/base/_editor.scss
  92. 14 2
      seedlet/assets/sass/base/_reset.scss
  93. 15 0
      seedlet/assets/sass/blocks/utilities/_editor.scss
  94. 3 0
      seedlet/assets/sass/style-editor.scss
  95. 7 1
      seedlet/assets/sass/vendors/jetpack/blocks/layout-grid/_editor.scss
  96. 19 1
      seedlet/assets/sass/vendors/jetpack/blocks/layout-grid/_style.scss
  97. 11 0
      seedlet/functions.php
  98. 3 1
      seedlet/postcss.config.js
  99. 33 5
      seedlet/style-rtl.css
  100. 33 5
      seedlet/style.css

+ 16 - 48
alves/inc/wpcom-colors.php

@@ -36,14 +36,6 @@ add_color_rule( 'bg', '#ffffff', array(
 			.wp-block-button__link,
 			.wp-block-button__link:focus,
 			.wp-block-button__link:hover,
-			.wp-block-cover-image.has-background-background-color .wp-block-cover-image-text,
-			.wp-block-cover-image.has-background-background-color .wp-block-cover-text,
-			.wp-block-cover-image.has-background-background-color .wp-block-cover__inner-container,
-			.wp-block-cover.has-background-background-color .wp-block-cover-image-text,
-			.wp-block-cover.has-background-background-color .wp-block-cover-text,
-			.wp-block-cover.has-background-background-color .wp-block-cover__inner-container,
-			.wp-block-cover.has-background-dim,
-			.wp-block-cover-image.has-background-dim,
 			.wp-block-file .wp-block-file__button,
 			.wp-block-file a.wp-block-file__button:active,
 			.wp-block-file a.wp-block-file__button:focus,
@@ -85,11 +77,14 @@ add_color_rule( 'bg', '#ffffff', array(
 			.has-background-dark-color[class],
 			.has-background-light-color[class]', 'color' ),
 	// Background-color
-	array( '.has-background-background-color[class]', 'background-color' ),
+	array( '.has-background-background-color[class],
+			.has-background-background-color.has-background-dim[class]', 'background-color' ),
 	// Background-color darkened
-	array( '.has-background-dark-background-color[class]', 'background-color', '-1' ),
+	array( '.has-background-dark-background-color[class],
+			.has-background-dark-background-color.has-background-dim[class]', 'background-color', '-1' ),
 	// Background-color lightened
-	array( '.has-background-light-background-color[class]', 'background-color', '+1' ),
+	array( '.has-background-light-background-color[class],
+			.has-background-light-background-color.has-background-dim[class]', 'background-color', '+1' ),
 
 	/**
  	 * Grays
@@ -174,7 +169,8 @@ add_color_rule( 'link', '#3E7D98', array(
 	 * Utility Classes
 	 */
 	// Background-color
-	array( '.has-primary-background-color[class]', 'background-color' ),
+	array( '.has-primary-background-color[class],
+			.has-primary-background-color.has-background-dim[class]', 'background-color' ),
 	// Text-color
 	array( '.has-primary-color[class]', 'color' ),
 
@@ -206,38 +202,6 @@ add_color_rule( 'txt', '#394d55', array(
 			body,
 			body .widget_eu_cookie_law_widget #eu-cookie-law,
 			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
-			input[type="color"],
-			input[type="color"]:focus,
-			input[type="date"],
-			input[type="date"]:focus,
-			input[type="datetime"],
-			input[type="datetime"]:focus,
-			input[type="datetime-local"],
-			input[type="datetime-local"]:focus,
-			input[type="email"],
-			input[type="email"]:focus,
-			input[type="month"],
-			input[type="month"]:focus,
-			input[type="number"],
-			input[type="number"]:focus,
-			input[type="password"],
-			input[type="password"]:focus,
-			input[type="range"],
-			input[type="range"]:focus,
-			input[type="search"],
-			input[type="search"]:focus,
-			input[type="tel"],
-			input[type="tel"]:focus,
-			input[type="text"],
-			input[type="text"]:focus,
-			input[type="time"],
-			input[type="time"]:focus,
-			input[type="url"],
-			input[type="url"]:focus,
-			input[type="week"],
-			input[type="week"]:focus,
-			textarea,
-			textarea:focus,
 			.site-header .main-navigation > div > ul > li .sub-menu a,
 			.a8c-posts-list__item .a8c-posts-list-item__meta,
 			.entry-footer,
@@ -278,17 +242,20 @@ add_color_rule( 'txt', '#394d55', array(
 	 */
 	// Foreground
 	array( '.has-foreground-color[class]', 'color' ),
-	array( '.has-foreground-background-color[class]', 'background-color' ),
+	array( '.has-foreground-background-color[class],
+			.has-foreground-background-color.has-background-dim[class]', 'background-color' ),
 
 	// Text-color darkened
 	array( '.has-foreground-dark-color[class]', 'color', '-1' ),
 	// Background-color darkened
-	array( '.has-foreground-dark-background-color[class]', 'background-color', '-1' ),
+	array( '.has-foreground-dark-background-color[class],
+			.has-foreground-dark-background-color.has-background-dim[class]', 'background-color', '-1' ),
 
 	// Text-color brightened
 	array( '.has-foreground-light-color[class]', 'color', '+2' ),
 	// Background-color brightened
-	array( '.has-foreground-light-background-color[class]', 'background-color', '+2' ),
+	array( '.has-foreground-light-background-color[class],
+			.has-foreground-light-background-color.has-background-dim[class]', 'background-color', '+2' ),
 
 ), __( 'Text Color' ) );
 
@@ -378,7 +345,8 @@ add_color_rule( 'fg1', '#9B6A36', array(
 	array( '.has-secondary-color[class]', 'color' ),
 
 	// Background-color
-	array( '.has-secondary-background-color[class]', 'background-color' ),
+	array( '.has-secondary-background-color[class],
+			.has-secondary-background-color.has-background-dim[class]', 'background-color' ),
 
 ), __( 'Secondary Color' ) );
 

+ 1 - 1
alves/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
alves/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
alves/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
alves/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #394d55;
+	color: black;
 	border: 1px solid #3E7D98;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #394d55;
+	color: black;
 	border-color: #2f5f74;
 }
 

+ 2 - 2
alves/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #394d55;
+	color: black;
 	border: 1px solid #3E7D98;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #394d55;
+	color: black;
 	border-color: #2f5f74;
 }
 

+ 1 - 1
balasana/sass/_config-child-theme-deep.scss

@@ -146,7 +146,7 @@ $config-elements: (
 	"form": (
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
balasana/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
balasana/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
balasana/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #D0D0D0;
 	border-radius: 4px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #145f3e;
 }
 

+ 2 - 2
balasana/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #D0D0D0;
 	border-radius: 4px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #145f3e;
 }
 

+ 1 - 1
barnsbury/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "dark"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 5 - 0
barnsbury/sass/style-child-theme-editor.scss

@@ -32,6 +32,11 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
 
 .wp-block-cover,
 .wp-block-cover-image,

+ 15 - 0
barnsbury/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 .wp-block-cover .wp-block-separator,
 .wp-block-cover-image .wp-block-separator,
 .has-background .wp-block-separator {

+ 2 - 2
barnsbury/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #3C2323;
+	color: black;
 	border: 1px solid #AAAAAA;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #3C2323;
+	color: black;
 	border-color: #133a24;
 }
 

+ 2 - 2
barnsbury/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #3C2323;
+	color: black;
 	border: 1px solid #AAAAAA;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #3C2323;
+	color: black;
 	border-color: #133a24;
 }
 

+ 1 - 1
brompton/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
brompton/sass/style-child-theme-editor.scss

@@ -33,6 +33,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
brompton/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
brompton/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #252E36;
+	color: black;
 	border: 1px solid #B9B6B2;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #252E36;
+	color: black;
 	border-color: #252E36;
 }
 

+ 2 - 2
brompton/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #252E36;
+	color: black;
 	border: 1px solid #B9B6B2;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #252E36;
+	color: black;
 	border-color: #252E36;
 }
 

+ 2 - 2
canard/js/single-thumbnail.js

@@ -2,9 +2,9 @@
 
 	$( window ).load( function() {
 
-		$( '.entry-meta, .entry-title' ).wrapAll( '<div class="entry-header-inner" />' );
+		$( '.page .hentry.has-post-thumbnail .entry-header .entry-meta, .single .hentry.has-post-thumbnail .entry-header .entry-meta, .page .hentry.has-post-thumbnail .entry-header .entry-title, .single .hentry.has-post-thumbnail .entry-header .entry-title' ).wrapAll( '<div class="entry-header-inner" />' );
 		$( '.entry-header-inner' ).wrap( '<div class="entry-header-wrapper" />' );
-		$( '.entry-header' ).insertBefore( '.site-content-inner' )
+		$( '.page .hentry.has-post-thumbnail .entry-header, .single .hentry.has-post-thumbnail .entry-header' ).insertBefore( '.site-content-inner' )
 		                    .addClass( 'entry-hero' );
 
 	} );

+ 1 - 33
coutoire/inc/wpcom-colors.php

@@ -192,39 +192,7 @@ add_color_rule( 'txt', '#444444', array(
 			.wp-block-pullquote,
 			body,
 			body .widget_eu_cookie_law_widget #eu-cookie-law,
-			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept,
-			input[type="color"],
-			input[type="color"]:focus,
-			input[type="date"],
-			input[type="date"]:focus,
-			input[type="datetime"],
-			input[type="datetime"]:focus,
-			input[type="datetime-local"],
-			input[type="datetime-local"]:focus,
-			input[type="email"],
-			input[type="email"]:focus,
-			input[type="month"],
-			input[type="month"]:focus,
-			input[type="number"],
-			input[type="number"]:focus,
-			input[type="password"],
-			input[type="password"]:focus,
-			input[type="range"],
-			input[type="range"]:focus,
-			input[type="search"],
-			input[type="search"]:focus,
-			input[type="tel"],
-			input[type="tel"]:focus,
-			input[type="text"],
-			input[type="text"]:focus,
-			input[type="time"],
-			input[type="time"]:focus,
-			input[type="url"],
-			input[type="url"]:focus,
-			input[type="week"],
-			input[type="week"]:focus,
-			textarea,
-			textarea:focus', 'color' ),
+			body .widget_eu_cookie_law_widget #eu-cookie-law.negative input.accept', 'color' ),
 
 	// Background-color
 	array( '.wp-block-cover.has-background-dim,

+ 1 - 1
coutoire/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
coutoire/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
coutoire/style-editor.css

@@ -1298,6 +1298,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: #000000;
+}
+
 /**
  * Extras
  */

+ 2 - 2
coutoire/style-rtl.css

@@ -1057,7 +1057,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: #000000;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: 16px;
@@ -1079,7 +1079,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: #000000;
 	border-color: #FF7A5C;
 }
 

+ 2 - 2
coutoire/style.css

@@ -1057,7 +1057,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: #000000;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: 16px;
@@ -1079,7 +1079,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: #000000;
 	border-color: #FF7A5C;
 }
 

+ 1 - 1
dalston/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
dalston/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
dalston/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
dalston/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #1e1e1e;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #1e1e1e;
+	color: black;
 	border-color: #005177;
 }
 

+ 2 - 2
dalston/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #1e1e1e;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #1e1e1e;
+	color: black;
 	border-color: #005177;
 }
 

+ 1 - 1
exford/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
exford/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
exford/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
exford/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #111111;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #111111;
+	color: black;
 	border-color: #195f2b;
 }
 

+ 2 - 2
exford/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #111111;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #111111;
+	color: black;
 	border-color: #195f2b;
 }
 

+ 1 - 1
hever/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
hever/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
hever/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
hever/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #C5C5C5;
 	border-radius: 5px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #303030;
 }
 

+ 2 - 2
hever/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #C5C5C5;
 	border-radius: 5px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #303030;
 }
 

+ 1 - 1
leven/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
leven/sass/style-child-theme-editor.scss

@@ -33,6 +33,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
leven/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
leven/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: black;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: calc( 0.33 * 16px);
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: black;
 	border-color: #1285ce;
 }
 

+ 2 - 2
leven/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: black;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: calc( 0.33 * 16px);
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: black;
 	border-color: #1285ce;
 }
 

+ 1 - 1
mayland/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
mayland/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
mayland/style-editor.css

@@ -1300,6 +1300,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
mayland/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #010101;
+	color: black;
 	border: 1px solid #e6e6e6;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #010101;
+	color: black;
 	border-color: #666666;
 }
 

+ 2 - 2
mayland/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #010101;
+	color: black;
 	border: 1px solid #e6e6e6;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #010101;
+	color: black;
 	border-color: #666666;
 }
 

+ 1 - 1
maywood/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
maywood/sass/style-child-theme-editor.scss

@@ -25,6 +25,12 @@
  */
 @import "../../varia/sass/elements/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Blocks
  * - These styles replace key Gutenberg Block styles for fonts, colors, and

+ 15 - 0
maywood/style-editor.css

@@ -282,6 +282,21 @@ object {
 	max-width: 100%;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Blocks
  * - These styles replace key Gutenberg Block styles for fonts, colors, and

+ 2 - 2
maywood/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #181818;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #181818;
+	color: black;
 	border-color: #685636;
 }
 

+ 2 - 2
maywood/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #181818;
+	color: black;
 	border: 1px solid #CCCCCC;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #181818;
+	color: black;
 	border-color: #685636;
 }
 

+ 1 - 1
morden/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
morden/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
morden/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
morden/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #C5C5C5;
 	border-radius: 5px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #303030;
 }
 

+ 2 - 2
morden/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #303030;
+	color: black;
 	border: 1px solid #C5C5C5;
 	border-radius: 5px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #303030;
+	color: black;
 	border-color: #303030;
 }
 

+ 1 - 1
redhill/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
redhill/sass/style-child-theme-editor.scss

@@ -44,6 +44,12 @@ html {
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 .wp-block-a8c-blog-posts {
 	.entry-title {
 		@include font-family( map-deep-get($config-global, "font", "family", "primary") );

+ 15 - 0
redhill/style-editor.css

@@ -1313,6 +1313,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 .wp-block-a8c-blog-posts .entry-title {
 	font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Times, "Times New Roman", serif;
 	font-family: var(--font-headings, Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Times, "Times New Roman", serif);

+ 2 - 2
redhill/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #222222;
+	color: black;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: calc( 0.33 * 16px);
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #222222;
+	color: black;
 	border-color: #222222;
 }
 

+ 2 - 2
redhill/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #222222;
+	color: black;
 	border: 1px solid #DDDDDD;
 	border-radius: 3px;
 	padding: calc( 0.33 * 16px);
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #222222;
+	color: black;
 	border-color: #222222;
 }
 

+ 10 - 0
rivington/functions.php

@@ -181,5 +181,15 @@ function rivington_editor_styles() {
 
 	// Enqueue Google fonts in the editor, if necessary
 	wp_enqueue_style( 'rivington-editor-fonts', rivington_fonts_url(), array(), null );
+
+	// Hide duplicate palette colors
+	$colors_array = get_theme_mod('colors_manager', array( 'colors' => true )); // color annotations array()
+	if ( ! empty( $colors_array ) && $colors_array['colors']['txt'] != '#F2F2F2' ) { // $config-global--color-foreground-light-default;
+		$inline_palette_css = '.block-editor-color-gradient-control .components-circular-option-picker__option-wrapper:nth-child(5),
+			.block-editor-color-gradient-control .components-circular-option-picker__option-wrapper:nth-child(6) {
+				display: none;
+			}';
+		wp_add_inline_style( 'wp-edit-blocks', $inline_palette_css );
+	}
 }
 add_action( 'enqueue_block_editor_assets', 'rivington_editor_styles' );

+ 22 - 36
rivington/inc/wpcom-colors.php

@@ -73,40 +73,7 @@ add_color_rule( 'bg', '#060f29', array(
 			button[data-load-more-btn],
 			input.has-focus[type="submit"],
 			input:focus[type="submit"],
-			input:hover[type="submit"],
-			input[type="color"],
-			input[type="color"]:focus,
-			input[type="date"],
-			input[type="date"]:focus,
-			input[type="datetime"],
-			input[type="datetime"]:focus,
-			input[type="datetime-local"],
-			input[type="datetime-local"]:focus,
-			input[type="email"],
-			input[type="email"]:focus,
-			input[type="month"],
-			input[type="month"]:focus,
-			input[type="number"],
-			input[type="number"]:focus,
-			input[type="password"],
-			input[type="password"]:focus,
-			input[type="range"],
-			input[type="range"]:focus,
-			input[type="search"],
-			input[type="search"]:focus,
-			input[type="submit"],
-			input[type="tel"],
-			input[type="tel"]:focus,
-			input[type="text"],
-			input[type="text"]:focus,
-			input[type="time"],
-			input[type="time"]:focus,
-			input[type="url"],
-			input[type="url"]:focus,
-			input[type="week"],
-			input[type="week"]:focus,
-			textarea,
-			textarea:focus', 'color' ),
+			input:hover[type="submit"]', 'color' ),
 
 	/**
 	 * Utility Classes
@@ -264,8 +231,8 @@ add_color_rule( 'txt', '#f2f2f2', array(
 			.site-header .main-navigation > div > ul > li:hover li > a', 'color' ),
 
 	// Background-color
-	array( '.wp-block-cover.has-background-dim,
-			.wp-block-cover-image.has-background-dim,
+	array( '.wp-block-cover.has-background-dim:not([class*="background-color"]),
+			.wp-block-cover-image.has-background-dim:not([class*="background-color"]),
 			.has-foreground-background-color[class],
 			table.is-style-stripes tbody tr:nth-child(odd),
 			.wp-block-table.is-style-stripes tbody tr:nth-child(odd),
@@ -426,6 +393,25 @@ add_color_rule( 'fg1', '#EE4266', array(
  * Custom CSS
  */
 function rivington_custom_colors_extra_css() { ?>
+	input[type="text"],
+	input[type="email"],
+	input[type="url"],
+	input[type="password"],
+	input[type="search"],
+	input[type="number"],
+	input[type="tel"],
+	input[type="range"],
+	input[type="date"],
+	input[type="month"],
+	input[type="week"],
+	input[type="time"],
+	input[type="datetime"],
+	input[type="datetime-local"],
+	input[type="color"],
+	textarea {
+		border-width: 1px;
+	}
+
 	@media screen and (min-width: 560px) {
 		.main-navigation > div > ul > li > .sub-menu > li:first-child > a {
 			border-top: 1px solid;

+ 1 - 1
rivington/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "background", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
rivington/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
rivington/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
rivington/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #060f29;
+	color: black;
 	border: 0 solid #353a46;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #060f29;
+	color: black;
 	border-color: #b59439;
 }
 

+ 2 - 2
rivington/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #060f29;
+	color: black;
 	border: 0 solid #353a46;
 	border-radius: 3px;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #060f29;
+	color: black;
 	border-color: #b59439;
 }
 

+ 1 - 1
rockfield/sass/_config-child-theme-deep.scss

@@ -148,7 +148,7 @@ $config-elements: (
 
 		// Colors
 		"color": (
-			"text": map-deep-get($config-global, "color", "foreground", "default"),
+			"text": map-deep-get($config-global, "color", "black"),
 			"border": map-deep-get($config-global, "color", "border", "default"),
 			"border-focus": map-deep-get($config-global, "color", "primary", "hover"),
 		),

+ 6 - 0
rockfield/sass/style-child-theme-editor.scss

@@ -32,6 +32,12 @@
  */
 @import "../../varia/sass/blocks/editor";
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+@import "../../varia/sass/vendors/editor";
+
 /**
  * Extras
  */

+ 15 - 0
rockfield/style-editor.css

@@ -1301,6 +1301,21 @@ table.is-style-stripes tbody tr:nth-child(odd),
 	padding-left: 32px !important;
 }
 
+/**
+ * Vendors
+ * - Styles for 3rd party plugins and WP extensions
+ */
+/**
+ * Vendors
+ * - 3rd-party compatibility styles
+ */
+/**
+ * Set Jetpack form text color
+ */
+.jetpack-contact-info-block .is-selected textarea.block-editor-plain-text {
+	color: black;
+}
+
 /**
  * Extras
  */

+ 2 - 2
rockfield/style-rtl.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: black;
 	border: 2px solid #E0E0E0;
 	border-radius: 0;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: black;
 	border-color: #444444;
 }
 

+ 2 - 2
rockfield/style.css

@@ -1058,7 +1058,7 @@ input[type="datetime"],
 input[type="datetime-local"],
 input[type="color"],
 textarea {
-	color: #444444;
+	color: black;
 	border: 2px solid #E0E0E0;
 	border-radius: 0;
 	padding: 16px;
@@ -1080,7 +1080,7 @@ input[type="datetime"]:focus,
 input[type="datetime-local"]:focus,
 input[type="color"]:focus,
 textarea:focus {
-	color: #444444;
+	color: black;
 	border-color: #444444;
 }
 

+ 9 - 1
seedlet-blocks/block-template-parts/footer.html

@@ -1,3 +1,11 @@
+<!-- wp:spacer {"height":30} -->
+<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
 <p class="has-text-align-center has-small-font-size">Proudly powered by <a href="https://wordpress.org">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- /wp:paragraph -->
+
+<!-- wp:spacer {"height":30} -->
+<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->

+ 9 - 1
seedlet-blocks/block-template-parts/header.html

@@ -1,3 +1,7 @@
+<!-- wp:spacer {"height":60} -->
+<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:image {"align":"center","width":128,"height":128,"sizeSlug":"large","className":""} -->
 <div class="wp-block-image"><figure class="aligncenter size-large is-resized"><img src="https://cldup.com/B9dfntUFJE.png" alt="" width="128" height="128"/></figure></div>
 <!-- /wp:image -->
@@ -10,4 +14,8 @@
 
 <!-- wp:navigation {"itemsJustification":"center"} -->
 <!-- wp:navigation-link {"label":"Home","url":"#"} /-->
-<!-- /wp:navigation -->
+<!-- /wp:navigation -->
+
+<!-- wp:spacer {"height":60} -->
+<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->

+ 0 - 11
seedlet-blocks/block-templates/home.html

@@ -1,11 +0,0 @@
-<!-- wp:group {"align":"full","className":"site-header","tagName":"header"} -->
-<div class="wp-block-group alignfull site-header"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"seedlet-blocks","align":"full"} /--></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","className":"site-content","tagName":"main"} -->
-<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container"><!-- wp:post-content {"align":"full"} /--></div></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"align":"full","className":"site-footer","tagName":"footer"} -->
-<div class="wp-block-group alignfull site-footer"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"seedlet-blocks","align":"full"} /--></div></div>
-<!-- /wp:group -->

+ 9 - 5
seedlet-blocks/block-templates/index.html

@@ -1,11 +1,15 @@
-<!-- wp:group {"align":"full","className":"site-header","tagName":"header"} -->
-<div class="wp-block-group alignfull site-header"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"seedlet-blocks","align":"full"} /--></div></div>
+<!-- wp:group {"align":"full","tagName":"header"} -->
+<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"seedlet-blocks","align":"full"} /--></div></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"align":"full","className":"site-content","tagName":"main"} -->
-<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container"><!-- wp:post-title /--><!-- wp:latest-posts {"postsToShow":100,"displayPostContent":true,"displayPostDate":true,"align":"full"} /--></div></div>
+<div class="wp-block-group alignfull site-content"><div class="wp-block-group__inner-container"><!-- wp:query-loop -->
+<!-- wp:post-title /-->
+
+<!-- wp:post-content /-->
+<!-- /wp:query-loop --></div></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"align":"full","className":"site-footer","tagName":"footer"} -->
-<div class="wp-block-group alignfull site-footer"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"seedlet-blocks","align":"full"} /--></div></div>
+<!-- wp:group {"align":"full","tagName":"footer"} -->
+<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"seedlet-blocks","align":"full"} /--></div></div>
 <!-- /wp:group -->

+ 4 - 4
seedlet-blocks/block-templates/singular.html

@@ -1,5 +1,5 @@
-<!-- wp:group {"align":"full","className":"site-header","tagName":"header"} -->
-<div class="wp-block-group alignfull site-header"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"seedlet-blocks","align":"full"} /--></div></div>
+<!-- wp:group {"align":"full","tagName":"header"} -->
+<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"header","theme":"seedlet-blocks","align":"full"} /--></div></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"align":"full","className":"site-content","tagName":"main"} -->
@@ -8,6 +8,6 @@
 <!-- wp:post-content {"align":"full"} /--></div></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"align":"full","className":"site-footer","tagName":"footer"} -->
-<div class="wp-block-group alignfull site-footer"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"seedlet-blocks","align":"full"} /--></div></div>
+<!-- wp:group {"align":"full","tagName":"footer"} -->
+<div class="wp-block-group alignfull"><div class="wp-block-group__inner-container"><!-- wp:template-part {"slug":"footer","theme":"seedlet-blocks","align":"full"} /--></div></div>
 <!-- /wp:group -->

+ 6 - 1
seedlet-blocks/style-editor.css

@@ -15,4 +15,9 @@ body {
 	--global--color-primary: var(--wp--preset--color--primary);
 	--global--color-secondary: var(--wp--preset--color--secondary);
 	--global--color-tertiary: var(--wp--preset--color--tertiary);
-}
+}
+
+.site-content .wp-block[data-align="full"] > [data-block], .site-content .wp-block.alignfull > [data-block] {
+	margin-top: 0;
+	margin-bottom: 0;
+}

+ 5 - 0
seedlet/assets/css/custom-color-overrides.css

@@ -0,0 +1,5 @@
+/**
+ * Custom Color Overrides
+ * 
+ * This file is automatically populated if the user chooses custom colors in the Customzier.
+ */

+ 112 - 84
seedlet/assets/css/ie.css

@@ -1142,32 +1142,32 @@ hr.wp-block-separator.is-style-wide {
  * - Sets spacing-vertical margin logic
  */
 .site-footer > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 .site-main > article > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 .site-main > .not-found > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 .entry-content > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 [class*="inner-container"] > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 .widget-area > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 .widget-column > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -1410,59 +1410,59 @@ input[type="submit"]:after,
 }
 
 button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 input[type="submit"]:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .wp-block-button__link:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .wp-block-file .wp-block-file__button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .a8c-posts-list__view-all:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 button[data-load-more-btn]:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 input[type="submit"]:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .wp-block-button__link:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .wp-block-file .wp-block-file__button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .a8c-posts-list__view-all:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 button[data-load-more-btn]:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 button:active {
@@ -1886,9 +1886,17 @@ a:focus {
 }
 
 a:active {
+	color: undefined;
+}
+
+p.has-background.has-link-color:not(.has-background-background-color) a {
 	color: #000000;
 }
 
+.has-link-color a {
+	border-bottom: 1px solid #000000;
+}
+
 *:focus {
 	outline-width: 1px;
 	outline-style: dotted;
@@ -2446,8 +2454,8 @@ object {
 }
 
 .wp-block-columns .wp-block-column > * {
-	margin-top: 19.8px;
-	margin-bottom: 19.8px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -2470,7 +2478,7 @@ object {
 }
 
 .wp-block-columns .wp-block-column:not(:last-child) {
-	margin-bottom: 19.8px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -2620,13 +2628,13 @@ object {
 }
 
 .wp-block-cover .wp-block-cover__inner-container > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 .wp-block-cover-image .wp-block-cover__inner-container > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -2716,7 +2724,7 @@ object {
 
 .wp-block-file .wp-block-file__button {
 	display: inline-block;
-	padding: 11.5px 12.5px;
+	padding: 12px 13px;
 }
 
 .wp-block-gallery {
@@ -2755,8 +2763,8 @@ object {
 }
 
 .wp-block-group .wp-block-group__inner-container > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -2775,7 +2783,7 @@ object {
 }
 
 .wp-block-group.has-background {
-	padding: 19.98px;
+	padding: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -3248,8 +3256,8 @@ dd {
 }
 
 .wp-block-media-text .wp-block-media-text__content > * {
-	margin-top: 19.98px;
-	margin-bottom: 19.98px;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -3283,7 +3291,7 @@ dd {
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: 13.2px;
+	padding: 13px;
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
@@ -3303,7 +3311,7 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	left: 0;
-	margin-left: 13.2px;
+	margin-left: 13px;
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -3313,7 +3321,7 @@ dd {
 
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
 	display: inline-block;
-	padding: 6.6px 13.2px;
+	padding: 7px 13px;
 }
 
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
@@ -3372,7 +3380,7 @@ p.has-background {
 	font-weight: bold;
 	font-size: 16px;
 	line-height: 1;
-	padding: 10px 13.2px;
+	padding: 10px 13px;
 }
 
 .a8c-posts-list__item {
@@ -3783,7 +3791,7 @@ p.has-background {
 	color: #333333;
 	line-height: 1.7;
 	max-width: inherit;
-	margin-right: 16.5px;
+	margin-right: 17px;
 	padding: 10px;
 }
 
@@ -4691,16 +4699,16 @@ nav a {
 		width: 0;
 	}
 	.primary-navigation > div > ul > li > a:before {
-		margin-bottom: -calc(0.5em + -0.38);
+		margin-bottom: -calc(1em + 0);
 	}
 	.woo-navigation > div > ul > li > a:before {
-		margin-bottom: -calc(0.5em + -0.38);
+		margin-bottom: -calc(1em + 0);
 	}
 	.primary-navigation > div > ul > li > a:after {
-		margin-top: -calc(0.5em + -0.39);
+		margin-top: -calc(1em + 0);
 	}
 	.woo-navigation > div > ul > li > a:after {
-		margin-top: -calc(0.5em + -0.39);
+		margin-top: -calc(1em + 0);
 	}
 }
 
@@ -4787,7 +4795,7 @@ nav a {
 	font-family: 'Playfair Display', Georgia, Times, serif;
 	font-size: 32px;
 	font-weight: normal;
-	padding: 6.6px 0;
+	padding: 7px 0;
 }
 
 .woo-navigation a {
@@ -4796,7 +4804,7 @@ nav a {
 	font-family: 'Playfair Display', Georgia, Times, serif;
 	font-size: 32px;
 	font-weight: normal;
-	padding: 6.6px 0;
+	padding: 7px 0;
 }
 
 @media only screen and (min-width: 482px) {
@@ -4804,13 +4812,13 @@ nav a {
 		font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
 		font-size: 16px;
 		font-weight: normal;
-		padding: 13.2px;
+		padding: 13px;
 	}
 	.woo-navigation a {
 		font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
 		font-size: 16px;
 		font-weight: normal;
-		padding: 13.2px;
+		padding: 13px;
 	}
 }
 
@@ -4828,26 +4836,26 @@ nav a {
 
 .primary-navigation .sub-menu {
 	list-style: none;
-	margin-left: 13.2px;
+	margin-left: 13px;
 }
 
 .woo-navigation .sub-menu {
 	list-style: none;
-	margin-left: 13.2px;
+	margin-left: 13px;
 }
 
 .primary-navigation .sub-menu .menu-item a {
 	font-size: 24px;
 	font-style: italic;
-	padding-top: 6.6px;
-	padding-bottom: 6.6px;
+	padding-top: 7px;
+	padding-bottom: 7px;
 }
 
 .woo-navigation .sub-menu .menu-item a {
 	font-size: 24px;
 	font-style: italic;
-	padding-top: 6.6px;
-	padding-bottom: 6.6px;
+	padding-top: 7px;
+	padding-bottom: 7px;
 }
 
 @media only screen and (min-width: 482px) {
@@ -4874,12 +4882,12 @@ nav a {
 	.primary-navigation .menu-item-has-children > .svg-icon {
 		display: inline-block;
 		height: 100%;
-		margin-right: 13.2px;
+		margin-right: 13px;
 	}
 	.woo-navigation .menu-item-has-children > .svg-icon {
 		display: inline-block;
 		height: 100%;
-		margin-right: 13.2px;
+		margin-right: 13px;
 	}
 }
 
@@ -4912,7 +4920,7 @@ nav a {
 }
 
 .social-navigation > div > ul > li {
-	margin-bottom: 13.2px;
+	margin-bottom: 13px;
 }
 
 .social-navigation > div > ul > li:first-of-type > a {
@@ -4926,7 +4934,7 @@ nav a {
 .social-navigation a {
 	color: #333333;
 	display: inline-block;
-	padding: 0 6.6px;
+	padding: 0 7px;
 }
 
 .social-navigation a:hover {
@@ -5038,7 +5046,7 @@ nav a {
 	font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
 	font-size: 16px;
 	font-weight: normal;
-	padding: 13.2px;
+	padding: 13px;
 	color: currentColor;
 }
 
@@ -5382,8 +5390,8 @@ nav a {
 	font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
 	font-size: 16px;
 	font-weight: normal;
-	margin-left: 13.2px;
-	margin-right: 13.2px;
+	margin-left: 13px;
+	margin-right: 13px;
 }
 
 .pagination .nav-links > *.current {
@@ -5495,7 +5503,7 @@ nav a {
 .comment-meta .comment-author {
 	line-height: 1.3;
 	margin-bottom: 5px;
-	padding-right: 62.5px;
+	padding-right: 63px;
 	max-width: calc(100% - 75px);
 }
 
@@ -5759,7 +5767,7 @@ nav a {
 
 @media only screen and (min-width: 482px) {
 	.comment-form > p.comment-form-author {
-		margin-right: 37.5px;
+		margin-right: 38px;
 	}
 	.comment-form > p.comment-notes, .comment-form > p.logged-in-as {
 		display: block;
@@ -5843,7 +5851,7 @@ img#wpstats {
 	font-family: 'Fira Sans', Helvetica, Arial, sans-serif;
 	font-size: 14px;
 	line-height: 1;
-	padding: 5px 6.6px;
+	padding: 5px 7px;
 }
 
 .page-title {
@@ -6325,59 +6333,59 @@ input[type="submit"]:after,
 }
 
 button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 input[type="submit"]:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .wp-block-button__link:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .wp-block-file .wp-block-file__button:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 .a8c-posts-list__view-all:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 button[data-load-more-btn]:before {
-	margin-bottom: -calc(0.5em + -0.38);
+	margin-bottom: -calc(1em + 0);
 }
 
 button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 input[type="submit"]:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .wp-block-button__link:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .wp-block-file .wp-block-file__button:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 .a8c-posts-list__view-all:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 button[data-load-more-btn]:after {
-	margin-top: -calc(0.5em + -0.39);
+	margin-top: -calc(1em + 0);
 }
 
 button:active {
@@ -6565,6 +6573,26 @@ button[data-load-more-btn],
 	padding-right: 20px !important;
 }
 
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+@media only screen and (min-width: 482px) {
+	.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+		margin-top: 30px;
+		margin-bottom: 30px;
+	}
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:first-child {
+	margin-top: 0;
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:last-child {
+	margin-bottom: 0;
+}
+
 /* Gutter Options */
 .wp-block-jetpack-layout-grid .wp-block-jetpack-layout-gutter__none {
 	grid-gap: 0px !important;

+ 139 - 8
seedlet/assets/css/style-editor.css

@@ -2,12 +2,10 @@
  * These styles should be loaded by the Block Editor only
  */
 :root, body {
-	/* Globals */
-	/* Font Family */
-	--global--font-primary: 'Playfair Display', Georgia, Times, serif;
-	--global--font-secondary: 'Fira Sans', Helvetica, Arial, sans-serif;
+	--global--font-primary: var(--font-headings, 'Playfair Display', Georgia, Times, serif);
+	--global--font-secondary: var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif);
 	--global--font-code: monospace, monospace;
-	--global--font-ui: var(--global--font-secondary);
+	--global--font-ui: var(--font-base, var(--global--font-secondary));
 	/* Font Size */
 	--global--font-size-root: 18px;
 	--global--font-size-ratio: 1.2;
@@ -305,7 +303,7 @@ body {
 
 a {
 	border-bottom: 1px solid var(--global--color-secondary);
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link, var(--global--color-primary));
 	text-decoration: none;
 }
 
@@ -314,7 +312,15 @@ a:hover, a:focus {
 }
 
 a:active {
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link, var(--global--color-primary));
+}
+
+p.has-background.has-link-color:not(.has-background-background-color) a {
+	color: var(--wp--style--color--link, var(--global--color-primary));
+}
+
+.has-link-color a {
+	border-bottom: 1px solid var(--wp--style--color--link);
 }
 
 button,
@@ -1180,6 +1186,120 @@ pre.wp-block-verse {
 /**
  * Spacing Overrides
  */
+/*
+ * Margins
+ */
+.margin-top-none {
+	margin-top: 0 !important;
+}
+
+.margin-top-half {
+	margin-top: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.margin-top-default {
+	margin-top: var(--global--spacing-vertical) !important;
+}
+
+.margin-right-none {
+	/*rtl:ignore*/
+	margin-right: 0 !important;
+}
+
+.margin-right-half {
+	/*rtl:ignore*/
+	margin-right: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.margin-right-default {
+	/*rtl:ignore*/
+	margin-right: var(--global--spacing-vertical) !important;
+}
+
+.margin-bottom-none {
+	margin-bottom: 0 !important;
+}
+
+.margin-bottom-half {
+	margin-bottom: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.margin-bottom-default {
+	margin-bottom: var(--global--spacing-vertical) !important;
+}
+
+.margin-left-none {
+	/*rtl:ignore*/
+	margin-left: 0 !important;
+}
+
+.margin-left-half {
+	/*rtl:ignore*/
+	margin-left: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.margin-left-default {
+	/*rtl:ignore*/
+	margin-left: var(--global--spacing-vertical) !important;
+}
+
+/*
+ * Padding
+ */
+.padding-top-none {
+	padding-top: 0 !important;
+}
+
+.padding-top-half {
+	padding-top: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.padding-top-default {
+	padding-top: var(--global--spacing-vertical) !important;
+}
+
+.padding-right-none {
+	/*rtl:ignore*/
+	padding-right: 0 !important;
+}
+
+.padding-right-half {
+	/*rtl:ignore*/
+	padding-right: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.padding-right-default {
+	/*rtl:ignore*/
+	padding-right: var(--global--spacing-vertical) !important;
+}
+
+.padding-bottom-none {
+	padding-bottom: 0 !important;
+}
+
+.padding-bottom-half {
+	padding-bottom: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.padding-bottom-default {
+	padding-bottom: var(--global--spacing-vertical) !important;
+}
+
+.padding-left-none {
+	/*rtl:ignore*/
+	padding-left: 0 !important;
+}
+
+.padding-left-half {
+	/*rtl:ignore*/
+	padding-left: calc(0.5 * var(--global--spacing-vertical)) !important;
+}
+
+.padding-left-default {
+	/*rtl:ignore*/
+	padding-left: var(--global--spacing-vertical) !important;
+}
+
 [data-block] {
 	margin-top: var(--global--spacing-vertical);
 	margin-bottom: var(--global--spacing-vertical);
@@ -1245,6 +1365,11 @@ pre.wp-block-verse {
 	max-width: none;
 }
 
+.block-editor-block-list__layout:not(.edit-site-block-editor__block-list) .wp-block[data-align="full"] > [data-block], .block-editor-block-list__layout:not(.edit-site-block-editor__block-list) .wp-block.alignfull > [data-block] {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
 .alignleft {
 	margin: 0;
 	margin-right: var(--global--spacing-horizontal);
@@ -1630,9 +1755,10 @@ pre.wp-block-verse {
 	padding-left: calc(var(--layout-grid--gutter-huge) + var(--layout-grid--background-offset));
 }
 
-/* Overlay grid */
+/* Overlay styles and margin reset */
 .wp-block-jetpack-layout-grid {
 	/* wpcom-overlay-grid is the classname targeting the grid overlay visual aid displayed in the editor */
+	/* Override default block margin rules */
 }
 
 .wp-block-jetpack-layout-grid .wpcom-overlay-grid {
@@ -1646,6 +1772,11 @@ pre.wp-block-verse {
 	padding-right: 0;
 }
 
+.wp-block-jetpack-layout-grid [data-type="jetpack/layout-grid-column"] {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
 .wp-block-jetpack-layout-grid.wp-block-jetpack-layout-gutter__none .wpcom-overlay-grid {
 	grid-gap: var(--layout-grid--gutter-none);
 }

+ 3 - 3
seedlet/assets/sass/abstracts/_config.scss

@@ -8,10 +8,10 @@ $typescale-ratio: 1.2; // Run ratio math on 1em == $typescale-base * $typescale-
 
 @mixin global-variables() {
 	/* Font Family */
-	--global--font-primary: 'Playfair Display', Georgia, Times, serif;
-	--global--font-secondary: 'Fira Sans', Helvetica, Arial, sans-serif;
+	--global--font-primary: var(--font-headings, 'Playfair Display', Georgia, Times, serif);
+	--global--font-secondary: var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif);
 	--global--font-code: monospace, monospace;
-	--global--font-ui: var(--global--font-secondary);
+	--global--font-ui: var(--font-base, var(--global--font-secondary));
 
 	/* Font Size */
 	--global--font-size-root: #{$typescale-root};

+ 14 - 2
seedlet/assets/sass/base/_editor.scss

@@ -19,7 +19,7 @@ body {
 // Links styles
 a {
 	border-bottom: 1px solid var(--global--color-secondary);
-	color: var(--global--color-primary);
+	color: var( --wp--style--color--link, var(--global--color-primary) );
 	text-decoration: none;
 
 	&:hover,
@@ -28,7 +28,19 @@ a {
 	}
 
 	&:active {
-		color: var(--global--color-primary);
+		color: var( --wp--style--color--link, var(--global--color-primary) );
+	}
+
+	// Enforce the custom link color even if a custom background color has been set.
+	// The extra specificity here is required to override the background color styles.
+	p.has-background.has-link-color:not(.has-background-background-color) & {
+		color: var( --wp--style--color--link, var(--global--color-primary) );
+	}
+
+	// If a custom link color has been assigned,
+	// switch the color of the bottom border too. 
+	.has-link-color & {
+		border-bottom: 1px solid var(--wp--style--color--link);
 	}
 }
 

+ 14 - 2
seedlet/assets/sass/base/_reset.scss

@@ -81,7 +81,7 @@ body {
 // Links styles
 a {
 	border-bottom: 1px solid var(--global--color-secondary);
-	color: var(--global--color-primary);
+	color: var( --wp--style--color--link, var(--global--color-primary) );
 	text-decoration: none;
 	
 	&:hover,
@@ -90,7 +90,19 @@ a {
 	}
 
 	&:active {
-		color: var(--global--color-primary);
+		color: var(--wp--style--color--link);
+	}
+
+	// Enforce the custom link color even if a custom background color has been set.
+	// The extra specificity here is required to override the background color styles.
+	p.has-background.has-link-color:not(.has-background-background-color) & {
+		color: var( --wp--style--color--link, var(--global--color-primary) );
+	}
+
+	// If a custom link color has been assigned,
+	// switch the color of the bottom border too. 
+	.has-link-color & {
+		border-bottom: 1px solid var( --wp--style--color--link, var(--global--color-primary) );
 	}
 }
 

+ 15 - 0
seedlet/assets/sass/blocks/utilities/_editor.scss

@@ -159,6 +159,8 @@
  * Spacing Overrides
  */
 
+ @import "spacing-overrides";
+
 [data-block] {
 	margin-top: var(--global--spacing-vertical);
 	margin-bottom: var(--global--spacing-vertical);
@@ -231,6 +233,19 @@
 	}
 }
 
+// Selects the post editor and not the site editor
+.block-editor-block-list__layout:not(.edit-site-block-editor__block-list){
+	.wp-block {
+		&[data-align="full"],
+		&.alignfull {
+			&>[data-block] {
+				margin-top: 0;
+				margin-bottom: 0;
+			}
+		}
+	}
+}
+
 .alignleft {
 	margin: 0;
 	margin-right: var(--global--spacing-horizontal);

+ 3 - 0
seedlet/assets/sass/style-editor.scss

@@ -5,6 +5,9 @@
 // Variables
 @import "variables-editor";
 
+// Variables
+@import "variables-editor";
+
 // Abstracts
 // - Mixins, variables and functions
 @import "abstracts/functions";

+ 7 - 1
seedlet/assets/sass/vendors/jetpack/blocks/layout-grid/_editor.scss

@@ -69,7 +69,7 @@
 	}
 }
 
-/* Overlay grid */
+/* Overlay styles and margin reset */
 .wp-block-jetpack-layout-grid {
 	/* wpcom-overlay-grid is the classname targeting the grid overlay visual aid displayed in the editor */
 	.wpcom-overlay-grid {
@@ -84,6 +84,12 @@
 			padding-right: 0;
 		}
 	}
+
+	/* Override default block margin rules */ 
+	[data-type="jetpack/layout-grid-column"] {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
 }
 
 @each $size in $layout-gutter-sizes {

+ 19 - 1
seedlet/assets/sass/vendors/jetpack/blocks/layout-grid/_style.scss

@@ -17,12 +17,30 @@
 			padding-left: var(--layout-grid--background-offset) !important;
 			padding-right: var(--layout-grid--background-offset) !important;
 		}
+
+		> * {
+			margin-top: calc( 0.666 * var(--global--spacing-vertical) );
+			margin-bottom: calc( 0.666 * var(--global--spacing-vertical) );
+
+			@include media(mobile) {
+				margin-top: var(--global--spacing-vertical);
+				margin-bottom: var(--global--spacing-vertical);
+			}
+
+			&:first-child {
+				margin-top: 0;
+			}
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+		}
 	}
 }
 
 /* Gutter Options */
 @each $size in $layout-gutter-sizes {
-.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-gutter__#{$size} {
+	.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-gutter__#{$size} {
 		grid-gap: var(--layout-grid--gutter-#{$size}) !important;
 	}
 }

+ 11 - 0
seedlet/functions.php

@@ -258,6 +258,17 @@ if ( ! function_exists( 'seedlet_setup' ) ) :
 
 		// Add support for responsive embedded content.
 		add_theme_support( 'responsive-embeds' );
+
+		// Add support for experimental link color control.
+		add_theme_support( 'experimental-link-color' );
+    
+		// Add support for WordPress.com Global Styles.
+		add_theme_support(
+			'jetpack-global-styles',
+			[
+				'enable_theme_default' => true,
+			]
+		);
 	}
 endif;
 add_action( 'after_setup_theme', 'seedlet_setup' );

+ 3 - 1
seedlet/postcss.config.js

@@ -5,6 +5,8 @@ module.exports = {
 			"preserve": false,
 			"preserveAtRulesOrder": true
 		}),
-		require( 'postcss-calc' )
+		require( 'postcss-calc' )({
+			"precision": 0
+		})
 	]
 }

+ 33 - 5
seedlet/style-rtl.css

@@ -70,10 +70,10 @@ Included in theme screenshot.
 */
 :root {
 	/* Font Family */
-	--global--font-primary: 'Playfair Display', Georgia, Times, serif;
-	--global--font-secondary: 'Fira Sans', Helvetica, Arial, sans-serif;
+	--global--font-primary: var(--font-headings, 'Playfair Display', Georgia, Times, serif);
+	--global--font-secondary: var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif);
 	--global--font-code: monospace, monospace;
-	--global--font-ui: var(--global--font-secondary);
+	--global--font-ui: var(--font-base, var(--global--font-secondary));
 	/* Font Size */
 	--global--font-size-root: 18px;
 	--global--font-size-ratio: 1.2;
@@ -975,7 +975,7 @@ body {
 
 a {
 	border-bottom: 1px solid var(--global--color-secondary);
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link, var(--global--color-primary));
 	text-decoration: none;
 }
 
@@ -984,7 +984,15 @@ a:hover, a:focus {
 }
 
 a:active {
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link);
+}
+
+p.has-link-color.has-background a {
+	color: var(--wp--style--color--link, var(--global--color-primary));
+}
+
+.has-link-color a {
+	border-bottom: 1px solid var(--wp--style--color--link, var(--global--color-primary));
 }
 
 *:focus {
@@ -4287,6 +4295,26 @@ button[data-load-more-btn],
 	padding-left: var(--layout-grid--background-offset) !important;
 }
 
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+	margin-top: calc( 0.666 * var(--global--spacing-vertical));
+	margin-bottom: calc( 0.666 * var(--global--spacing-vertical));
+}
+
+@media only screen and (min-width: 482px) {
+	.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+		margin-top: var(--global--spacing-vertical);
+		margin-bottom: var(--global--spacing-vertical);
+	}
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:first-child {
+	margin-top: 0;
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:last-child {
+	margin-bottom: 0;
+}
+
 /* Gutter Options */
 .wp-block-jetpack-layout-grid .wp-block-jetpack-layout-gutter__none {
 	grid-gap: var(--layout-grid--gutter-none) !important;

+ 33 - 5
seedlet/style.css

@@ -70,10 +70,10 @@ Included in theme screenshot.
 */
 :root {
 	/* Font Family */
-	--global--font-primary: 'Playfair Display', Georgia, Times, serif;
-	--global--font-secondary: 'Fira Sans', Helvetica, Arial, sans-serif;
+	--global--font-primary: var(--font-headings, 'Playfair Display', Georgia, Times, serif);
+	--global--font-secondary: var(--font-base, 'Fira Sans', Helvetica, Arial, sans-serif);
 	--global--font-code: monospace, monospace;
-	--global--font-ui: var(--global--font-secondary);
+	--global--font-ui: var(--font-base, var(--global--font-secondary));
 	/* Font Size */
 	--global--font-size-root: 18px;
 	--global--font-size-ratio: 1.2;
@@ -983,7 +983,7 @@ body {
 
 a {
 	border-bottom: 1px solid var(--global--color-secondary);
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link, var(--global--color-primary));
 	text-decoration: none;
 }
 
@@ -992,7 +992,15 @@ a:hover, a:focus {
 }
 
 a:active {
-	color: var(--global--color-primary);
+	color: var(--wp--style--color--link);
+}
+
+p.has-background.has-link-color:not(.has-background-background-color) a {
+	color: var(--wp--style--color--link, var(--global--color-primary));
+}
+
+.has-link-color a {
+	border-bottom: 1px solid var(--wp--style--color--link, var(--global--color-primary));
 }
 
 *:focus {
@@ -4312,6 +4320,26 @@ button[data-load-more-btn],
 	padding-right: var(--layout-grid--background-offset) !important;
 }
 
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+	margin-top: calc( 0.666 * var(--global--spacing-vertical));
+	margin-bottom: calc( 0.666 * var(--global--spacing-vertical));
+}
+
+@media only screen and (min-width: 482px) {
+	.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > * {
+		margin-top: var(--global--spacing-vertical);
+		margin-bottom: var(--global--spacing-vertical);
+	}
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:first-child {
+	margin-top: 0;
+}
+
+.wp-block-jetpack-layout-grid .wp-block-jetpack-layout-grid-column > *:last-child {
+	margin-bottom: 0;
+}
+
 /* Gutter Options */
 .wp-block-jetpack-layout-grid .wp-block-jetpack-layout-gutter__none {
 	grid-gap: var(--layout-grid--gutter-none) !important;

部分文件因为文件数量过多而无法显示