Browse Source

Merge branch 'master' of https://github.com/Automattic/themes

Allan Cole 5 years ago
parent
commit
e0ca000ed5
46 changed files with 1778 additions and 549 deletions
  1. 32 0
      calm-business/functions.php
  2. 19 1
      calm-business/sass/blocks/_blocks.scss
  3. 16 0
      calm-business/style-editor.css
  4. 17 1
      calm-business/style-editor.scss
  5. 23 1
      calm-business/style-rtl.css
  6. 23 1
      calm-business/style.css
  7. 25 0
      coutoire/inc/headstart/en.json
  8. 32 0
      elegant-business/functions.php
  9. 14 0
      elegant-business/sass/blocks/_blocks.scss
  10. 30 0
      elegant-business/style-editor.css
  11. 13 1
      elegant-business/style-editor.scss
  12. 15 0
      elegant-business/style-rtl.css
  13. 15 0
      elegant-business/style.css
  14. 33 0
      friendly-business/functions.php
  15. 14 0
      friendly-business/sass/blocks/_blocks.scss
  16. 27 0
      friendly-business/style-editor.css
  17. 13 1
      friendly-business/style-editor.scss
  18. 15 0
      friendly-business/style-rtl.css
  19. 15 0
      friendly-business/style.css
  20. 0 12
      modern-business/functions.php
  21. 0 238
      modern-business/inc/fse-template-data.php
  22. 26 4
      modern-business/sass/blocks/_blocks.scss
  23. 5 0
      modern-business/sass/navigation/_menu-main-navigation.scss
  24. 8 0
      modern-business/sass/site/header/_site-header.scss
  25. 66 0
      modern-business/style-editor.css
  26. 25 2
      modern-business/style-editor.scss
  27. 409 104
      modern-business/style-rtl.css
  28. 409 104
      modern-business/style.css
  29. 25 0
      morden/inc/headstart/en.json
  30. 110 0
      morden/languages/morden.pot
  31. 2 2
      morden/sass/style-child-theme.scss
  32. BIN
      morden/screenshot.png
  33. 2 2
      morden/style-rtl.css
  34. 2 2
      morden/style.css
  35. 32 0
      professional-business/functions.php
  36. 14 0
      professional-business/sass/blocks/_blocks.scss
  37. 16 5
      professional-business/style-editor.css
  38. 13 3
      professional-business/style-editor.scss
  39. 15 0
      professional-business/style-rtl.css
  40. 15 0
      professional-business/style.css
  41. 32 0
      sophisticated-business/functions.php
  42. 17 5
      sophisticated-business/sass/blocks/_blocks.scss
  43. 30 18
      sophisticated-business/style-editor.css
  44. 16 4
      sophisticated-business/style-editor.scss
  45. 49 19
      sophisticated-business/style-rtl.css
  46. 49 19
      sophisticated-business/style.css

+ 32 - 0
calm-business/functions.php

@@ -32,6 +32,38 @@ if ( ! function_exists( 'calm_business_setup' ) ) {
                 'header-text' => array( 'site-title' ),
             )
         );
+
+        // Editor color palette.
+		add_theme_support(
+			'editor-color-palette',
+			array(
+				array(
+					'name'  => __( 'Primary', 'calm-business' ),
+					'slug'  => 'primary',
+					'color' => '#8D6708', // $color__link
+				),
+				array(
+					'name'  => __( 'Secondary', 'calm-business' ),
+					'slug'  => 'secondary',
+					'color' => '#5d4405', // $color__border-link-hover
+				),
+				array(
+					'name'  => __( 'Dark Gray', 'calm-business' ),
+					'slug'  => 'dark-gray',
+					'color' => '#242424', // $color__text-main
+				),
+				array(
+					'name'  => __( 'Light Gray', 'calm-business' ),
+					'slug'  => 'light-gray',
+					'color' => '#6C6C74', // $color__background-body-dark
+				),
+				array(
+					'name'  => __( 'White', 'calm-business' ),
+					'slug'  => 'white',
+					'color' => '#ffffff', // $color__text-light
+				),
+			)
+		);
     }
 } // calm_business_setup
 add_action( 'after_setup_theme', 'calm_business_setup', 30 );

+ 19 - 1
calm-business/sass/blocks/_blocks.scss

@@ -573,6 +573,24 @@
 			text-align: inherit;
 		}
 
+		h2 {
+			padding: 0;
+			max-width: inherit; // undo opinionated styles
+			text-align: inherit;
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
+		}
+
 		h3 {
 			font-size: $font__size-md;
 		}
@@ -1060,7 +1078,7 @@
 
 	.has-light-gray-background-color,
 	.wp-block-pullquote.is-style-solid-color.has-light-gray-background-color {
-		background-color: $color__text-light;
+		background-color: $color__background-body-dark;
 	}
 
 	.has-white-background-color,

+ 16 - 0
calm-business/style-editor.css

@@ -1140,9 +1140,21 @@ figcaption,
   font-size: 1.6875em;
   max-width: 100%;
   padding: 0;
+  text-align: inherit;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-left {
   text-align: left;
 }
 
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover .wp-block-cover__inner-container h3 {
   font-size: 1.125em;
 }
@@ -1185,6 +1197,10 @@ figcaption,
   }
 }
 
+.wp-block-cover h2 {
+  text-align: inherit;
+}
+
 @media only screen and (min-width: 768px) {
   .wp-block-cover {
     padding: 1rem 10%;

+ 17 - 1
calm-business/style-editor.scss

@@ -319,7 +319,19 @@ figcaption,
 			font-size: $font__size-lg;
 			max-width: 100%;
 			padding: 0;
-			text-align: left;
+			text-align: inherit;
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
 		}
 
 		h3 {
@@ -369,6 +381,10 @@ figcaption,
 		}
 	}
 
+	h2 {
+		text-align: inherit;
+	}
+
 	@include media(tablet) {
 		padding: $size__spacing-unit 10%;
 		min-height: 620px;

+ 23 - 1
calm-business/style-rtl.css

@@ -4125,6 +4125,28 @@ body.page .main-navigation {
   text-align: inherit;
 }
 
+.entry .entry-content .wp-block-cover-image h2,
+.entry .entry-content .wp-block-cover h2 {
+  padding: 0;
+  max-width: inherit;
+  text-align: inherit;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: right;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: left;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;
@@ -4664,7 +4686,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-light-gray-background-color,
 .entry .entry-content .wp-block-pullquote.is-style-solid-color.has-light-gray-background-color {
-  background-color: #fff;
+  background-color: #6C6C74;
 }
 
 .entry .entry-content .has-white-background-color,

+ 23 - 1
calm-business/style.css

@@ -4137,6 +4137,28 @@ body.page .main-navigation {
   text-align: inherit;
 }
 
+.entry .entry-content .wp-block-cover-image h2,
+.entry .entry-content .wp-block-cover h2 {
+  padding: 0;
+  max-width: inherit;
+  text-align: inherit;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: left;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: right;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;
@@ -4676,7 +4698,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-light-gray-background-color,
 .entry .entry-content .wp-block-pullquote.is-style-solid-color.has-light-gray-background-color {
-  background-color: #fff;
+  background-color: #6C6C74;
 }
 
 .entry .entry-content .has-white-background-color,

File diff suppressed because it is too large
+ 25 - 0
coutoire/inc/headstart/en.json


+ 32 - 0
elegant-business/functions.php

@@ -32,6 +32,38 @@ function elegant_business_setup() {
 			'header-text' => array( 'site-title' ),
 		)
 	);
+
+	// Editor color palette.
+	add_theme_support(
+		'editor-color-palette',
+		array(
+			array(
+				'name'  => __( 'Primary', 'elegant-business' ),
+				'slug'  => 'primary',
+				'color' => '#c43d80', // $color__link
+			),
+			array(
+				'name'  => __( 'Secondary', 'elegant-business' ),
+				'slug'  => 'secondary',
+				'color' => '#9e3067', // $color__border-link-hover
+			),
+			array(
+				'name'  => __( 'Dark Gray', 'elegant-business' ),
+				'slug'  => 'dark-gray',
+				'color' => '#111111', // $color__text-main
+			),
+			array(
+				'name'  => __( 'Light Gray', 'elegant-business' ),
+				'slug'  => 'light-gray',
+				'color' => '#767676', // $color__text-light
+			),
+			array(
+				'name'  => __( 'White', 'elegant-business' ),
+				'slug'  => 'white',
+				'color' => '#ffffff',
+			),
+		)
+	);
 }
 endif; // elegant_business_setup
 add_action( 'after_setup_theme', 'elegant_business_setup', 30 );

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

@@ -572,6 +572,20 @@
 			}
 		}
 
+		h2 {
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
+		}
+
 		h3 {
 			font-size: $font__size-md;
 

+ 30 - 0
elegant-business/style-editor.css

@@ -1092,9 +1092,39 @@ figcaption,
 .wp-block-cover-image .wp-block-cover__inner-container h4,
 .wp-block-cover-image .wp-block-cover__inner-container h5,
 .wp-block-cover-image .wp-block-cover__inner-container h6 {
+  text-align: inherit;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h1.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h2.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h3.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h4.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h5.has-text-align-left,
+.wp-block-cover-image .wp-block-cover__inner-container h6.has-text-align-left {
   text-align: left;
 }
 
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h1.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h2.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h3.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h4.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h5.has-text-align-center,
+.wp-block-cover-image .wp-block-cover__inner-container h6.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h1.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h2.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h3.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h4.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h5.has-text-align-right,
+.wp-block-cover-image .wp-block-cover__inner-container h6.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover .wp-block-cover__inner-container h1,
 .wp-block-cover-image .wp-block-cover__inner-container h1 {
   font-size: 2.25em;

+ 13 - 1
elegant-business/style-editor.scss

@@ -285,7 +285,19 @@ figcaption,
 		}
 
 		h1, h2, h3, h4, h5, h6 {
-			text-align: left;
+			text-align: inherit;
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
 		}
 
 		h1 {

+ 15 - 0
elegant-business/style-rtl.css

@@ -3970,6 +3970,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: right;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: left;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 15 - 0
elegant-business/style.css

@@ -3982,6 +3982,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: left;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: right;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 33 - 0
friendly-business/functions.php

@@ -32,6 +32,39 @@ function friendly_business_setup() {
 			'header-text' => array( 'site-title' ),
 		)
 	);
+
+	// Editor color palette.
+	add_theme_support(
+		'editor-color-palette',
+		array(
+			array(
+				'name'  => __( 'Primary', 'friendly-business' ),
+				'slug'  => 'primary',
+				'color' => '#20603c', // $color__link
+			),
+			array(
+				'name'  => __( 'Secondary', 'friendly-business' ),
+				'slug'  => 'secondary',
+				'color' => '#133a24', // $color__border-link-hover
+			),
+			array(
+				'name'  => __( 'Dark Gray', 'friendly-business' ),
+				'slug'  => 'dark-gray',
+				'color' => '#3c2323', // $color__text-main
+			),
+			array(
+				'name'  => __( 'Light Gray', 'friendly-business' ),
+				'slug'  => 'light-gray',
+				'color' => '#0d1b24', // $color__text-dark
+			),
+
+			array(
+				'name'  => __( 'White', 'friendly-business' ),
+				'slug'  => 'white',
+				'color' => '#ffffff',
+			),
+		)
+	);
 }
 endif; // friendly_business_setup
 add_action( 'after_setup_theme', 'friendly_business_setup', 30 );

+ 14 - 0
friendly-business/sass/blocks/_blocks.scss

@@ -563,6 +563,20 @@
 			}
 		}
 
+		h2 {
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
+		}
+
 		h3 {
 			font-size: $font__size-md;
 

+ 27 - 0
friendly-business/style-editor.css

@@ -1203,9 +1203,36 @@ figcaption,
 .wp-block-cover h4,
 .wp-block-cover h5,
 .wp-block-cover h6 {
+  text-align: inherit;
+}
+
+.wp-block-cover h1.has-text-align-left,
+.wp-block-cover h2.has-text-align-left,
+.wp-block-cover h3.has-text-align-left,
+.wp-block-cover h4.has-text-align-left,
+.wp-block-cover h5.has-text-align-left,
+.wp-block-cover h6.has-text-align-left {
   text-align: left;
 }
 
+.wp-block-cover h1.has-text-align-center,
+.wp-block-cover h2.has-text-align-center,
+.wp-block-cover h3.has-text-align-center,
+.wp-block-cover h4.has-text-align-center,
+.wp-block-cover h5.has-text-align-center,
+.wp-block-cover h6.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover h1.has-text-align-right,
+.wp-block-cover h2.has-text-align-right,
+.wp-block-cover h3.has-text-align-right,
+.wp-block-cover h4.has-text-align-right,
+.wp-block-cover h5.has-text-align-right,
+.wp-block-cover h6.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover h1 {
   font-size: 2.25em;
 }

+ 13 - 1
friendly-business/style-editor.scss

@@ -341,7 +341,19 @@ figcaption,
 	h4,
 	h5,
 	h6 {
-		text-align: left;
+		text-align: inherit;
+
+		&.has-text-align-left {
+			text-align: left;
+		}
+
+		&.has-text-align-center {
+			text-align: center;
+		}
+
+		&.has-text-align-right {
+			text-align: right;
+		}
 	}
 
 	h1 {

+ 15 - 0
friendly-business/style-rtl.css

@@ -3975,6 +3975,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: right;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: left;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 15 - 0
friendly-business/style.css

@@ -3987,6 +3987,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: left;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: right;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 0 - 12
modern-business/functions.php

@@ -115,15 +115,3 @@ require get_stylesheet_directory() . '/inc/jetpack.php';
  * WP.com compatibility file.
  */
 require get_stylesheet_directory() . '/inc/wpcom.php';
-
-/**
- * Full Site Editing template data population file.
- */
-require get_stylesheet_directory() . '/inc/fse-template-data.php';
-
-function a8c_fse_insert_theme_template_data() {
-	$data_inserter = new A8C_WP_Templates_Data_Inserter();
-	$data_inserter->insert_default_template_data();
-}
-
-add_action( 'after_switch_theme', 'a8c_fse_insert_theme_template_data' );

+ 0 - 238
modern-business/inc/fse-template-data.php

@@ -1,238 +0,0 @@
-<?php
-/**
- * Template data inserter file.
- *
- * @package full-site-editing
- */
-
-/**
- * Class A8C_WP_Templates_Data_Inserter
- */
-class A8C_WP_Templates_Data_Inserter {
-	/*
-	 * Modern Business header content.
-	 *
-	 * @var string $header_content
-	 */
-	private $header_content;
-
-	/*
-	 * Modern Business footer content.
-	 *
-	 * @var string $footer_content
-	 */
-	private $footer_content;
-
-	/*
-	 * Current theme slug.
-	 *
-	 * @var string $theme_slug
-	 */
-	private $theme_slug;
-
-	/**
-	 * A8C_WP_Template_Parts_Data_Inserter constructor.
-	 */
-	public function __construct() {
-		$this->theme_slug = get_option( 'stylesheet' );
-		$this->header_content = '';
-		$this->footer_content = '';
-	}
-
-	/**
-	 * Retrieves template parts content from WP.com API.
-	 */
-	public function fetch_template_parts() {
-		$request_url = 'https://public-api.wordpress.com/wpcom/v2/full-site-editing/templates';
-
-		$request_args = [
-			'body' => [ 'theme_slug' => $this->theme_slug ],
-		];
-
-		$response = wp_remote_get( $request_url, $request_args );
-
-		if ( is_wp_error( $response ) ) {
-			return;
-		}
-
-		$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		// Default to first returned header for now. Support for multiple headers will be added in future iterations.
-		if ( ! empty( $api_response['headers'] ) ) {
-			$this->header_content = $api_response['headers'][0];
-		}
-
-		// Default to first returned footer for now. Support for multiple footers will be added in future iterations.
-		if ( ! empty( $api_response['footers'] ) ) {
-			$this->footer_content = $api_response['footers'][0];
-		}
-	}
-
-	/**
-	 * This function will be called on plugin activation hook.
-	 */
-	public function insert_default_template_data() {
-		/**
-		 * This site option will be used to indicate that template data has already been
-		 * inserted for this theme, in order to prevent this functionality from running
-		 * more than once.
-		 */
-		$fse_template_data_option = $this->theme_slug . '-fse-template-data';
-
-		if ( get_option( $fse_template_data_option ) ) {
-			/*
-			 * Bail here to prevent inserting the FSE data twice for any given theme.
-			 * Multiple themes will still be able to insert different templates.
-			 */
-			return;
-		}
-
-		// Set header and footer content based on data fetched from the WP.com API.
-		$this->fetch_template_parts();
-
-		// Avoid creating template parts if data hasn't been fetched properly.
-		if ( empty( $this->header_content ) || empty( $this->footer_content ) ) {
-			return;
-		}
-
-		$this->register_template_post_types();
-
-		$header_id = wp_insert_post(
-			[
-				'post_title'     => 'Header',
-				'post_content'   => $this->header_content,
-				'post_status'    => 'publish',
-				'post_type'      => 'wp_template',
-				'comment_status' => 'closed',
-				'ping_status'    => 'closed',
-			]
-		);
-
-		if ( ! term_exists( "$this->theme_slug-header", 'wp_template_type' ) ) {
-			wp_insert_term( "$this->theme_slug-header", 'wp_template_type' );
-		}
-
-		wp_set_object_terms( $header_id, "$this->theme_slug-header", 'wp_template_type' );
-
-		$footer_id = wp_insert_post(
-			[
-				'post_title'     => 'Footer',
-				'post_content'   => $this->footer_content,
-				'post_status'    => 'publish',
-				'post_type'      => 'wp_template',
-				'comment_status' => 'closed',
-				'ping_status'    => 'closed',
-			]
-		);
-
-		if ( ! term_exists( "$this->theme_slug-footer", 'wp_template_type' ) ) {
-			wp_insert_term( "$this->theme_slug-footer", 'wp_template_type' );
-		}
-
-		wp_set_object_terms( $footer_id, "$this->theme_slug-footer", 'wp_template_type' );
-
-		add_option( $fse_template_data_option, true );
-	}
-
-	/**
-	 * Register post types.
-	 */
-	public function register_template_post_types() {
-		register_post_type(
-			'wp_template',
-			array(
-				'labels'                => array(
-					'name'                     => _x( 'Templates', 'post type general name', 'full-site-editing' ),
-					'singular_name'            => _x( 'Template', 'post type singular name', 'full-site-editing' ),
-					'menu_name'                => _x( 'Templates', 'admin menu', 'full-site-editing' ),
-					'name_admin_bar'           => _x( 'Template', 'add new on admin bar', 'full-site-editing' ),
-					'add_new'                  => _x( 'Add New', 'Template', 'full-site-editing' ),
-					'add_new_item'             => __( 'Add New Template', 'full-site-editing' ),
-					'new_item'                 => __( 'New Template', 'full-site-editing' ),
-					'edit_item'                => __( 'Edit Template', 'full-site-editing' ),
-					'view_item'                => __( 'View Template', 'full-site-editing' ),
-					'view_items'               => __( 'View Templates', 'full-site-editing' ),
-					'all_items'                => __( 'All Templates', 'full-site-editing' ),
-					'search_items'             => __( 'Search Templates', 'full-site-editing' ),
-					'not_found'                => __( 'No templates found.', 'full-site-editing' ),
-					'not_found_in_trash'       => __( 'No templates found in Trash.', 'full-site-editing' ),
-					'filter_items_list'        => __( 'Filter templates list', 'full-site-editing' ),
-					'items_list_navigation'    => __( 'Templates list navigation', 'full-site-editing' ),
-					'items_list'               => __( 'Templates list', 'full-site-editing' ),
-					'item_published'           => __( 'Template published.', 'full-site-editing' ),
-					'item_published_privately' => __( 'Template published privately.', 'full-site-editing' ),
-					'item_reverted_to_draft'   => __( 'Template reverted to draft.', 'full-site-editing' ),
-					'item_scheduled'           => __( 'Template scheduled.', 'full-site-editing' ),
-					'item_updated'             => __( 'Template updated.', 'full-site-editing' ),
-				),
-				'menu_icon'             => 'dashicons-layout',
-				'public'                => false,
-				'show_ui'               => true,
-				'show_in_menu'          => true,
-				'rewrite'               => false,
-				'show_in_rest'          => true,
-				'rest_base'             => 'template',
-				'rest_controller_class' => 'A8C_REST_Templates_Controller',
-				'capability_type'       => 'template',
-				'capabilities'          => array(
-					// You need to be able to edit posts, in order to read templates in their raw form.
-					'read'                   => 'edit_posts',
-					// You need to be able to customize, in order to create templates.
-					'create_posts'           => 'edit_theme_options',
-					'edit_posts'             => 'edit_theme_options',
-					'delete_posts'           => 'edit_theme_options',
-					'edit_published_posts'   => 'edit_theme_options',
-					'delete_published_posts' => 'edit_theme_options',
-					'edit_others_posts'      => 'edit_theme_options',
-					'delete_others_posts'    => 'edit_theme_options',
-					'publish_posts'          => 'edit_theme_options',
-				),
-				'map_meta_cap'          => true,
-				'supports'              => array(
-					'title',
-					'editor',
-				),
-			)
-		);
-
-		register_taxonomy(
-			'wp_template_type',
-			'wp_template',
-			array(
-				'labels'             => array(
-					'name'              => _x( 'Template Types', 'taxonomy general name', 'full-site-editing' ),
-					'singular_name'     => _x( 'Template Type', 'taxonomy singular name', 'full-site-editing' ),
-					'menu_name'         => _x( 'Template Types', 'admin menu', 'full-site-editing' ),
-					'all_items'         => __( 'All Template Types', 'full-site-editing' ),
-					'edit_item'         => __( 'Edit Template Type', 'full-site-editing' ),
-					'view_item'         => __( 'View Template Type', 'full-site-editing' ),
-					'update_item'       => __( 'Update Template Type', 'full-site-editing' ),
-					'add_new_item'      => __( 'Add New Template Type', 'full-site-editing' ),
-					'new_item_name'     => __( 'New Template Type', 'full-site-editing' ),
-					'parent_item'       => __( 'Parent Template Type', 'full-site-editing' ),
-					'parent_item_colon' => __( 'Parent Template Type:', 'full-site-editing' ),
-					'search_items'      => __( 'Search Template Types', 'full-site-editing' ),
-					'not_found'         => __( 'No template types found.', 'full-site-editing' ),
-					'back_to_items'     => __( 'Back to template types', 'full-site-editing' ),
-				),
-				'public'             => false,
-				'publicly_queryable' => true,
-				'show_ui'            => true,
-				'show_in_menu'       => false,
-				'show_in_nav_menu'   => false,
-				'show_in_rest'       => true,
-				'rest_base'          => 'template_types',
-				'show_tagcloud'      => false,
-				'show_admin_column'  => true,
-				'hierarchical'       => true,
-				'rewrite'            => false,
-				'capabilities'       => array(
-					'manage_terms' => 'edit_theme_options',
-					'edit_terms'   => 'edit_theme_options',
-					'delete_terms' => 'edit_theme_options',
-					'assign_terms' => 'edit_theme_options',
-				),
-			)
-		);
-	}
-}

+ 26 - 4
modern-business/sass/blocks/_blocks.scss

@@ -1,7 +1,9 @@
 /* !Block styles */
 
 .entry .entry-content > *,
-.entry .entry-summary > * {
+.entry .entry-summary > *, 
+.fse-enabled .site-header > *,
+.fse-enabled .site-footer > * {
 	margin: $size__vertical-spacing-unit 0;
 	max-width: 100%;
 
@@ -96,7 +98,9 @@
 /*
  * Make sure the first block has margin-top: 0
  */
-.entry:not(.has-post-thumbnail) .entry-content > :first-child {
+.entry:not(.has-post-thumbnail) .entry-content > :first-child,
+.fse-enabled .site-header > :first-child,
+.fse-enabled .site-footer > :first-child {
 	margin-top: 0;
 }
 
@@ -106,7 +110,9 @@
  * - helps with plugin compatibility
  */
 .entry .entry-content,
-.entry .entry-summary {
+.entry .entry-summary,
+.fse-enabled .site-header,
+.fse-enabled .site-footer {
 
 	.entry-content,
 	.entry-summary,
@@ -123,7 +129,9 @@
 	}
 }
 
-.entry .entry-content {
+.entry .entry-content,
+.fse-enabled .site-header,
+.fse-enabled .site-footer {
 
 	//! Headers
 	& > h1,
@@ -730,6 +738,20 @@
 			}
 		}
 
+		h2 {
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
+		}
+
 		h3 {
 			font-size: $font__size-md;
 

+ 5 - 0
modern-business/sass/navigation/_menu-main-navigation.scss

@@ -6,6 +6,11 @@
 	margin-top: #{0.6 * $size__spacing-unit};
 	order: 3;
 
+	body.fse-enabled & {
+		// With FSE, we want the placement of the nav menu to be set in gutenberg:
+		order: initial;
+	}
+
 	body.page & {
 		display: block;
 	}

+ 8 - 0
modern-business/sass/site/header/_site-header.scss

@@ -24,6 +24,14 @@
 			margin-bottom: 2rem;
 		}
 	}
+
+	.fse-site-logo {
+		margin-bottom: 0;
+		img {
+			margin-left: auto;
+			margin-right: auto;
+		}
+	}
 }
 
 // Site branding

+ 66 - 0
modern-business/style-editor.css

@@ -39,6 +39,15 @@ Modern Business Editor Styles
   }
 }
 
+.site-header .fse-site-logo {
+  margin-bottom: 0;
+}
+
+.site-header .fse-site-logo img {
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .site-branding {
   color: #686868;
   display: flex;
@@ -249,6 +258,10 @@ Modern Business Editor Styles
 	 */
 }
 
+body.fse-enabled .main-navigation {
+  order: initial;
+}
+
 body.page .main-navigation {
   display: block;
 }
@@ -911,6 +924,7 @@ blockquote {
 /** === Editor Frame === */
 body {
   font-weight: 300;
+  background: #fff;
 }
 
 body .wp-block[data-align="full"] {
@@ -1264,9 +1278,54 @@ figcaption,
 .wp-block-cover h5,
 .wp-block-cover h6 {
   font-weight: 300;
+  text-align: inherit;
+}
+
+.wp-block-cover-image h1.has-text-align-left,
+.wp-block-cover-image h2.has-text-align-left,
+.wp-block-cover-image h3.has-text-align-left,
+.wp-block-cover-image h4.has-text-align-left,
+.wp-block-cover-image h5.has-text-align-left,
+.wp-block-cover-image h6.has-text-align-left,
+.wp-block-cover h1.has-text-align-left,
+.wp-block-cover h2.has-text-align-left,
+.wp-block-cover h3.has-text-align-left,
+.wp-block-cover h4.has-text-align-left,
+.wp-block-cover h5.has-text-align-left,
+.wp-block-cover h6.has-text-align-left {
   text-align: left;
 }
 
+.wp-block-cover-image h1.has-text-align-center,
+.wp-block-cover-image h2.has-text-align-center,
+.wp-block-cover-image h3.has-text-align-center,
+.wp-block-cover-image h4.has-text-align-center,
+.wp-block-cover-image h5.has-text-align-center,
+.wp-block-cover-image h6.has-text-align-center,
+.wp-block-cover h1.has-text-align-center,
+.wp-block-cover h2.has-text-align-center,
+.wp-block-cover h3.has-text-align-center,
+.wp-block-cover h4.has-text-align-center,
+.wp-block-cover h5.has-text-align-center,
+.wp-block-cover h6.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover-image h1.has-text-align-right,
+.wp-block-cover-image h2.has-text-align-right,
+.wp-block-cover-image h3.has-text-align-right,
+.wp-block-cover-image h4.has-text-align-right,
+.wp-block-cover-image h5.has-text-align-right,
+.wp-block-cover-image h6.has-text-align-right,
+.wp-block-cover h1.has-text-align-right,
+.wp-block-cover h2.has-text-align-right,
+.wp-block-cover h3.has-text-align-right,
+.wp-block-cover h4.has-text-align-right,
+.wp-block-cover h5.has-text-align-right,
+.wp-block-cover h6.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover-image h1,
 .wp-block-cover h1 {
   font-size: 2.25em;
@@ -1846,6 +1905,13 @@ ul.wp-block-archives li ul,
   line-height: 0.8em;
 }
 
+/** === Site Logo Block === */
+.template__site-logo .components-placeholder.block-editor-media-placeholder {
+  width: 380px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 /** === Classic Editor === */
 /* Properly center-align captions in the classic-editor block */
 .wp-caption dd {

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

@@ -33,9 +33,11 @@ Modern Business Editor Styles
 }
 
 /** === Editor Frame === */
-
+// Targets just the editor frame area, not outside it.
+// See https://github.com/WordPress/gutenberg/blob/0ad0414e7a469254ef1ad105fdcf14248a986686/docs/designers-developers/developers/themes/theme-support.md#editor-styles
 body {
 	font-weight: 300;
+	background: $color__background-body;
 
 	.wp-block[data-align="full"] {
 		width: 100%;
@@ -346,7 +348,19 @@ figcaption,
 	h5,
 	h6 {
 		font-weight: 300;
-		text-align: left;
+		text-align: inherit;
+
+		&.has-text-align-left {
+			text-align: left;
+		}
+
+		&.has-text-align-center {
+			text-align: center;
+		}
+
+		&.has-text-align-right {
+			text-align: right;
+		}
 	}
 
 	h1 {
@@ -919,6 +933,15 @@ ul.wp-block-archives,
 	}
 }
 
+/** === Site Logo Block === */
+.template__site-logo {
+	.components-placeholder.block-editor-media-placeholder {
+		width: 380px;
+		margin-left: auto;
+        margin-right: auto;
+    }
+}
+
 /** === Classic Editor === */
 
 /* Properly center-align captions in the classic-editor block */

File diff suppressed because it is too large
+ 409 - 104
modern-business/style-rtl.css


File diff suppressed because it is too large
+ 409 - 104
modern-business/style.css


File diff suppressed because it is too large
+ 25 - 0
morden/inc/headstart/en.json


+ 110 - 0
morden/languages/morden.pot

@@ -0,0 +1,110 @@
+# Copyright (C) 2019 Automattic
+# This file is distributed under the GNU General Public License v2 or later.
+msgid ""
+msgstr ""
+"Project-Id-Version: Morden 1.0\n"
+"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/morden\n"
+"POT-Creation-Date: 2019-08-08 09:07:01+00:00\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2019-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+
+#: functions.php:30
+msgid "Small"
+msgstr ""
+
+#: functions.php:31
+msgid "S"
+msgstr ""
+
+#: functions.php:36
+msgid "Normal"
+msgstr ""
+
+#: functions.php:37
+msgid "M"
+msgstr ""
+
+#: functions.php:42
+msgid "Large"
+msgstr ""
+
+#: functions.php:43
+msgid "L"
+msgstr ""
+
+#: functions.php:48
+msgid "Huge"
+msgstr ""
+
+#: functions.php:49
+msgid "XL"
+msgstr ""
+
+#: functions.php:61
+msgid "Primary"
+msgstr ""
+
+#: functions.php:66
+msgid "Secondary"
+msgstr ""
+
+#: functions.php:71
+msgid "Dark Gray"
+msgstr ""
+
+#: functions.php:76
+msgid "Gray"
+msgstr ""
+
+#: functions.php:81
+msgid "Light Gray"
+msgstr ""
+
+#: functions.php:86
+msgid "Lighter Gray"
+msgstr ""
+
+#: functions.php:91
+msgid "Subtle Gray"
+msgstr ""
+
+#: functions.php:96
+msgid "White"
+msgstr ""
+
+#. Translators: If there are characters in your language that are not supported
+#. by Noto Sans, translate this to 'off'. Do not translate into your own
+#. language.
+#: functions.php:134
+msgctxt "Noto Sans font: on or off"
+msgid "on"
+msgstr ""
+
+#. Theme Name of the plugin/theme
+#: wp-content/themes/pub/morden/style.css
+msgid "Morden"
+msgstr ""
+
+#. Theme URI of the plugin/theme
+#: wp-content/themes/pub/morden/style.css
+msgid "https://github.com/Automattic/themes/varia"
+msgstr ""
+
+#. Description of the plugin/theme
+#: wp-content/themes/pub/morden/style.css
+msgid "A design system for WordPress sites built with Gutenberg."
+msgstr ""
+
+#. Author of the plugin/theme
+#: wp-content/themes/pub/morden/style.css
+msgid "Automattic"
+msgstr ""
+
+#. Author URI of the plugin/theme
+#: wp-content/themes/pub/morden/style.css
+msgid "https://automattic.com/"
+msgstr ""

+ 2 - 2
morden/sass/style-child-theme.scss

@@ -1,9 +1,9 @@
 /*
 Theme Name: Morden
-Theme URI: https://github.com/Automattic/themes/varia
+Theme URI: https://github.com/Automattic/themes/morden
 Author: Automattic
 Author URI: https://automattic.com/
-Description: A design system for WordPress sites built with Gutenberg.
+Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Version: 1.0
 License: GNU General Public License v2 or later

BIN
morden/screenshot.png


+ 2 - 2
morden/style-rtl.css

@@ -1,10 +1,10 @@
 @charset "UTF-8";
 /*
 Theme Name: Morden
-Theme URI: https://github.com/Automattic/themes/varia
+Theme URI: https://github.com/Automattic/themes/morden
 Author: Automattic
 Author URI: https://automattic.com/
-Description: A design system for WordPress sites built with Gutenberg.
+Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Version: 1.0
 License: GNU General Public License v2 or later

+ 2 - 2
morden/style.css

@@ -1,10 +1,10 @@
 @charset "UTF-8";
 /*
 Theme Name: Morden
-Theme URI: https://github.com/Automattic/themes/varia
+Theme URI: https://github.com/Automattic/themes/morden
 Author: Automattic
 Author URI: https://automattic.com/
-Description: A design system for WordPress sites built with Gutenberg.
+Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Version: 1.0
 License: GNU General Public License v2 or later

+ 32 - 0
professional-business/functions.php

@@ -32,6 +32,38 @@ function professional_business_setup() {
 			'header-text' => array( 'site-title' ),
 		)
 	);
+
+	// Editor color palette.
+	add_theme_support(
+		'editor-color-palette',
+		array(
+			array(
+				'name'  => __( 'Primary', 'professional-business' ),
+				'slug'  => 'primary',
+				'color' => '#0073aa', // $color__link
+			),
+			array(
+				'name'  => __( 'Secondary', 'professional-business' ),
+				'slug'  => 'secondary',
+				'color' => '#005077', // $color__border-link-hover
+			),
+			array(
+				'name'  => __( 'Dark Gray', 'professional-business' ),
+				'slug'  => 'dark-gray',
+				'color' => '#1e1e1e', // $color__text-main
+			),
+			array(
+				'name'  => __( 'Light Gray', 'professional-business' ),
+				'slug'  => 'light-gray',
+				'color' => '#767676', // $color__text-light
+			),
+			array(
+				'name'  => __( 'White', 'professional-business' ),
+				'slug'  => 'white',
+				'color' => '#ffffff',
+			),
+		)
+	);
 }
 endif; // professional_business_setup
 add_action( 'after_setup_theme', 'professional_business_setup', 30 );

+ 14 - 0
professional-business/sass/blocks/_blocks.scss

@@ -568,6 +568,20 @@
 			}
 		}
 
+		h2 {
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
+		}
+
 		h3 {
 			font-size: $font__size-md;
 

+ 16 - 5
professional-business/style-editor.css

@@ -1203,7 +1203,7 @@ figcaption,
   font-size: 1.6875em;
   max-width: 100%;
   padding: 0;
-  text-align: left;
+  text-align: inherit;
 }
 
 @media only screen and (min-width: 768px) {
@@ -1213,6 +1213,21 @@ figcaption,
   }
 }
 
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-left,
+.wp-block-cover .wp-block-cover-text h2.has-text-align-left {
+  text-align: left;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-center,
+.wp-block-cover .wp-block-cover-text h2.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h2.has-text-align-right,
+.wp-block-cover .wp-block-cover-text h2.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover .wp-block-cover__inner-container h3,
 .wp-block-cover .wp-block-cover-text h3 {
   font-size: 1.125em;
@@ -1309,18 +1324,14 @@ figcaption,
 }
 
 @media only screen and (min-width: 768px) {
-  .wp-block[data-type="core/cover"][data-align="wide"] h2,
   .wp-block[data-type="core/cover"][data-align="wide"] .wp-block-cover-text,
-  .wp-block[data-type="core/cover"][data-align="full"] h2,
   .wp-block[data-type="core/cover"][data-align="full"] .wp-block-cover-text {
     max-width: calc(8 * (100vw / 12) - 43px);
   }
 }
 
 @media only screen and (min-width: 1168px) {
-  .wp-block[data-type="core/cover"][data-align="wide"] h2,
   .wp-block[data-type="core/cover"][data-align="wide"] .wp-block-cover-text,
-  .wp-block[data-type="core/cover"][data-align="full"] h2,
   .wp-block[data-type="core/cover"][data-align="full"] .wp-block-cover-text {
     max-width: calc(6 * (100vw / 12) - 43px);
   }

+ 13 - 3
professional-business/style-editor.scss

@@ -329,11 +329,23 @@ figcaption,
 			font-size: $font__size-lg;
 			max-width: 100%;
 			padding: 0;
-			text-align: left;
+			text-align: inherit;
 
 			@include media(tablet) {
 				font-size: $font__size-xl;
 			}
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
 		}
 
 		h3 {
@@ -419,7 +431,6 @@ figcaption,
 
 	@include media(tablet) {
 
-		h2,
 		.wp-block-cover-text {
 			max-width: calc(8 * (100vw / 12) - 43px); // 43px is the 28px + 15px -- half of the padding on blocks like paragraph
 		}
@@ -427,7 +438,6 @@ figcaption,
 
 	@include media(desktop) {
 
-		h2,
 		.wp-block-cover-text {
 			max-width: calc(6 * (100vw / 12) - 43px); // 43px is the 28px + 15px -- half of the padding on blocks like paragraph
 		}

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

@@ -4023,6 +4023,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: right;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: left;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 15 - 0
professional-business/style.css

@@ -4035,6 +4035,21 @@ body.page .main-navigation {
   }
 }
 
+.entry .entry-content .wp-block-cover-image h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left {
+  text-align: left;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right {
+  text-align: right;
+}
+
 .entry .entry-content .wp-block-cover-image h3,
 .entry .entry-content .wp-block-cover h3 {
   font-size: 1.125em;

+ 32 - 0
sophisticated-business/functions.php

@@ -34,6 +34,38 @@ function sophisticated_business_setup() {
 			'header-text' => array( 'site-title' ),
 		)
 	);
+
+	// Editor color palette.
+	add_theme_support(
+		'editor-color-palette',
+		array(
+			array(
+				'name'  => __( 'Primary', 'sophisticated-business' ),
+				'slug'  => 'primary',
+				'color' => '#caab57', // $color__link
+			),
+			array(
+				'name'  => __( 'Secondary', 'sophisticated-business' ),
+				'slug'  => 'secondary',
+				'color' => '#b59439', // $color__border-link-hover
+			),
+			array(
+				'name'  => __( 'Dark Gray', 'sophisticated-business' ),
+				'slug'  => 'dark-gray',
+				'color' => '#1c1c1c', // $color__text-screen
+			),
+			array(
+				'name'  => __( 'Light Gray', 'sophisticated-business' ),
+				'slug'  => 'light-gray',
+				'color' => '#cccccc', // $color__text-light
+			),
+			array(
+				'name'  => __( 'White', 'sophisticated-business' ),
+				'slug'  => 'white',
+				'color' => '#ffffff',
+			),
+		)
+	);
 }
 endif; // sophisticated_business_setup
 add_action( 'after_setup_theme', 'sophisticated_business_setup', 30 );

+ 17 - 5
sophisticated-business/sass/blocks/_blocks.scss

@@ -569,6 +569,18 @@
 
 		h1, h2, h3, h4, h5, h6 {
 			font-weight: 700;
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
 		}
 
 		h1 {
@@ -1022,10 +1034,10 @@
 	//! Custom background colors
 	.has-primary-background-color,
 	.has-secondary-background-color,
-	.has-dark-gray-background-color,
+	.has-white-background-color,
 	.has-light-gray-background-color {
 
-		// Use white text against these backgrounds by default.
+		// Use dark gray text against these background by default.
 		color: $color__background-body;
 
 		p,
@@ -1040,10 +1052,10 @@
 		}
 	}
 
-	.has-white-background-color {
+	.has-dark-gray-background-color {
 		color: $color__text-main;
 
-		// Use dark gray text against this background by default.
+		// Use white text against this backgrounds by default.
 		p,
 		h1,
 		h2,
@@ -1068,7 +1080,7 @@
 
 	.has-dark-gray-background-color,
 	.wp-block-pullquote.is-style-solid-color.has-dark-gray-background-color {
-		background-color: $color__text-main;
+		background-color: $color__background-screen;
 	}
 
 	.has-light-gray-background-color,

+ 30 - 18
sophisticated-business/style-editor.css

@@ -946,7 +946,7 @@ a:focus {
 
 .has-primary-background-color,
 .has-secondary-background-color,
-.has-dark-gray-background-color,
+.has-white-background-color,
 .has-light-gray-background-color {
   color: #080808;
 }
@@ -967,14 +967,14 @@ a:focus {
 .has-secondary-background-color h5,
 .has-secondary-background-color h6,
 .has-secondary-background-color a,
-.has-dark-gray-background-color p,
-.has-dark-gray-background-color h1,
-.has-dark-gray-background-color h2,
-.has-dark-gray-background-color h3,
-.has-dark-gray-background-color h4,
-.has-dark-gray-background-color h5,
-.has-dark-gray-background-color h6,
-.has-dark-gray-background-color a,
+.has-white-background-color p,
+.has-white-background-color h1,
+.has-white-background-color h2,
+.has-white-background-color h3,
+.has-white-background-color h4,
+.has-white-background-color h5,
+.has-white-background-color h6,
+.has-white-background-color a,
 .has-light-gray-background-color p,
 .has-light-gray-background-color h1,
 .has-light-gray-background-color h2,
@@ -986,18 +986,18 @@ a:focus {
   color: #080808;
 }
 
-.has-white-background-color {
+.has-dark-gray-background-color {
   color: #fff;
 }
 
-.has-white-background-color p,
-.has-white-background-color h1,
-.has-white-background-color h2,
-.has-white-background-color h3,
-.has-white-background-color h4,
-.has-white-background-color h5,
-.has-white-background-color h6,
-.has-white-background-color a {
+.has-dark-gray-background-color p,
+.has-dark-gray-background-color h1,
+.has-dark-gray-background-color h2,
+.has-dark-gray-background-color h3,
+.has-dark-gray-background-color h4,
+.has-dark-gray-background-color h5,
+.has-dark-gray-background-color h6,
+.has-dark-gray-background-color a {
   color: #fff;
 }
 
@@ -1086,6 +1086,18 @@ figcaption,
   font-weight: 700;
 }
 
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-left, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-left {
+  text-align: left;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-center, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-center {
+  text-align: center;
+}
+
+.wp-block-cover .wp-block-cover__inner-container h1.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h2.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h3.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h4.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h5.has-text-align-right, .wp-block-cover .wp-block-cover__inner-container h6.has-text-align-right {
+  text-align: right;
+}
+
 .wp-block-cover .wp-block-cover__inner-container h1 {
   font-size: 2.25em;
 }

+ 16 - 4
sophisticated-business/style-editor.scss

@@ -170,10 +170,10 @@ a {
 	}
 }
 
-// Use white text against these backgrounds by default.
+// Use dark gray text against these background by default.
 .has-primary-background-color,
 .has-secondary-background-color,
-.has-dark-gray-background-color,
+.has-white-background-color,
 .has-light-gray-background-color {
 	color: $color__background-body;
 
@@ -189,8 +189,8 @@ a {
 	}
 }
 
-// Use dark gray text against this background by default.
-.has-white-background-color {
+// Use white text against these backgrounds by default.
+.has-dark-gray-background-color {
 	color: $color__text-main;
 
 	p,
@@ -293,6 +293,18 @@ figcaption,
 
 		h1, h2, h3, h4, h5, h6 {
 			font-weight: 700;
+
+			&.has-text-align-left {
+				text-align: left;
+			}
+
+			&.has-text-align-center {
+				text-align: center;
+			}
+
+			&.has-text-align-right {
+				text-align: right;
+			}
 		}
 
 		h1 {

+ 49 - 19
sophisticated-business/style-rtl.css

@@ -3912,6 +3912,36 @@ body.page .main-navigation {
   font-weight: 700;
 }
 
+.entry .entry-content .wp-block-cover-image h1.has-text-align-left, .entry .entry-content .wp-block-cover-image h2.has-text-align-left, .entry .entry-content .wp-block-cover-image h3.has-text-align-left, .entry .entry-content .wp-block-cover-image h4.has-text-align-left, .entry .entry-content .wp-block-cover-image h5.has-text-align-left, .entry .entry-content .wp-block-cover-image h6.has-text-align-left,
+.entry .entry-content .wp-block-cover h1.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h3.has-text-align-left,
+.entry .entry-content .wp-block-cover h4.has-text-align-left,
+.entry .entry-content .wp-block-cover h5.has-text-align-left,
+.entry .entry-content .wp-block-cover h6.has-text-align-left {
+  text-align: right;
+}
+
+.entry .entry-content .wp-block-cover-image h1.has-text-align-center, .entry .entry-content .wp-block-cover-image h2.has-text-align-center, .entry .entry-content .wp-block-cover-image h3.has-text-align-center, .entry .entry-content .wp-block-cover-image h4.has-text-align-center, .entry .entry-content .wp-block-cover-image h5.has-text-align-center, .entry .entry-content .wp-block-cover-image h6.has-text-align-center,
+.entry .entry-content .wp-block-cover h1.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h3.has-text-align-center,
+.entry .entry-content .wp-block-cover h4.has-text-align-center,
+.entry .entry-content .wp-block-cover h5.has-text-align-center,
+.entry .entry-content .wp-block-cover h6.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h1.has-text-align-right, .entry .entry-content .wp-block-cover-image h2.has-text-align-right, .entry .entry-content .wp-block-cover-image h3.has-text-align-right, .entry .entry-content .wp-block-cover-image h4.has-text-align-right, .entry .entry-content .wp-block-cover-image h5.has-text-align-right, .entry .entry-content .wp-block-cover-image h6.has-text-align-right,
+.entry .entry-content .wp-block-cover h1.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h3.has-text-align-right,
+.entry .entry-content .wp-block-cover h4.has-text-align-right,
+.entry .entry-content .wp-block-cover h5.has-text-align-right,
+.entry .entry-content .wp-block-cover h6.has-text-align-right {
+  text-align: left;
+}
+
 .entry .entry-content .wp-block-cover-image h1,
 .entry .entry-content .wp-block-cover h1 {
   font-size: 2.25em;
@@ -4373,7 +4403,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-primary-background-color,
 .entry .entry-content .has-secondary-background-color,
-.entry .entry-content .has-dark-gray-background-color,
+.entry .entry-content .has-white-background-color,
 .entry .entry-content .has-light-gray-background-color {
   color: #080808;
 }
@@ -4394,14 +4424,14 @@ body.page .main-navigation {
 .entry .entry-content .has-secondary-background-color h5,
 .entry .entry-content .has-secondary-background-color h6,
 .entry .entry-content .has-secondary-background-color a,
-.entry .entry-content .has-dark-gray-background-color p,
-.entry .entry-content .has-dark-gray-background-color h1,
-.entry .entry-content .has-dark-gray-background-color h2,
-.entry .entry-content .has-dark-gray-background-color h3,
-.entry .entry-content .has-dark-gray-background-color h4,
-.entry .entry-content .has-dark-gray-background-color h5,
-.entry .entry-content .has-dark-gray-background-color h6,
-.entry .entry-content .has-dark-gray-background-color a,
+.entry .entry-content .has-white-background-color p,
+.entry .entry-content .has-white-background-color h1,
+.entry .entry-content .has-white-background-color h2,
+.entry .entry-content .has-white-background-color h3,
+.entry .entry-content .has-white-background-color h4,
+.entry .entry-content .has-white-background-color h5,
+.entry .entry-content .has-white-background-color h6,
+.entry .entry-content .has-white-background-color a,
 .entry .entry-content .has-light-gray-background-color p,
 .entry .entry-content .has-light-gray-background-color h1,
 .entry .entry-content .has-light-gray-background-color h2,
@@ -4413,18 +4443,18 @@ body.page .main-navigation {
   color: #080808;
 }
 
-.entry .entry-content .has-white-background-color {
+.entry .entry-content .has-dark-gray-background-color {
   color: #fff;
 }
 
-.entry .entry-content .has-white-background-color p,
-.entry .entry-content .has-white-background-color h1,
-.entry .entry-content .has-white-background-color h2,
-.entry .entry-content .has-white-background-color h3,
-.entry .entry-content .has-white-background-color h4,
-.entry .entry-content .has-white-background-color h5,
-.entry .entry-content .has-white-background-color h6,
-.entry .entry-content .has-white-background-color a {
+.entry .entry-content .has-dark-gray-background-color p,
+.entry .entry-content .has-dark-gray-background-color h1,
+.entry .entry-content .has-dark-gray-background-color h2,
+.entry .entry-content .has-dark-gray-background-color h3,
+.entry .entry-content .has-dark-gray-background-color h4,
+.entry .entry-content .has-dark-gray-background-color h5,
+.entry .entry-content .has-dark-gray-background-color h6,
+.entry .entry-content .has-dark-gray-background-color a {
   color: #fff;
 }
 
@@ -4440,7 +4470,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-dark-gray-background-color,
 .entry .entry-content .wp-block-pullquote.is-style-solid-color.has-dark-gray-background-color {
-  background-color: #fff;
+  background-color: #1c1c1c;
 }
 
 .entry .entry-content .has-light-gray-background-color,

+ 49 - 19
sophisticated-business/style.css

@@ -3924,6 +3924,36 @@ body.page .main-navigation {
   font-weight: 700;
 }
 
+.entry .entry-content .wp-block-cover-image h1.has-text-align-left, .entry .entry-content .wp-block-cover-image h2.has-text-align-left, .entry .entry-content .wp-block-cover-image h3.has-text-align-left, .entry .entry-content .wp-block-cover-image h4.has-text-align-left, .entry .entry-content .wp-block-cover-image h5.has-text-align-left, .entry .entry-content .wp-block-cover-image h6.has-text-align-left,
+.entry .entry-content .wp-block-cover h1.has-text-align-left,
+.entry .entry-content .wp-block-cover h2.has-text-align-left,
+.entry .entry-content .wp-block-cover h3.has-text-align-left,
+.entry .entry-content .wp-block-cover h4.has-text-align-left,
+.entry .entry-content .wp-block-cover h5.has-text-align-left,
+.entry .entry-content .wp-block-cover h6.has-text-align-left {
+  text-align: left;
+}
+
+.entry .entry-content .wp-block-cover-image h1.has-text-align-center, .entry .entry-content .wp-block-cover-image h2.has-text-align-center, .entry .entry-content .wp-block-cover-image h3.has-text-align-center, .entry .entry-content .wp-block-cover-image h4.has-text-align-center, .entry .entry-content .wp-block-cover-image h5.has-text-align-center, .entry .entry-content .wp-block-cover-image h6.has-text-align-center,
+.entry .entry-content .wp-block-cover h1.has-text-align-center,
+.entry .entry-content .wp-block-cover h2.has-text-align-center,
+.entry .entry-content .wp-block-cover h3.has-text-align-center,
+.entry .entry-content .wp-block-cover h4.has-text-align-center,
+.entry .entry-content .wp-block-cover h5.has-text-align-center,
+.entry .entry-content .wp-block-cover h6.has-text-align-center {
+  text-align: center;
+}
+
+.entry .entry-content .wp-block-cover-image h1.has-text-align-right, .entry .entry-content .wp-block-cover-image h2.has-text-align-right, .entry .entry-content .wp-block-cover-image h3.has-text-align-right, .entry .entry-content .wp-block-cover-image h4.has-text-align-right, .entry .entry-content .wp-block-cover-image h5.has-text-align-right, .entry .entry-content .wp-block-cover-image h6.has-text-align-right,
+.entry .entry-content .wp-block-cover h1.has-text-align-right,
+.entry .entry-content .wp-block-cover h2.has-text-align-right,
+.entry .entry-content .wp-block-cover h3.has-text-align-right,
+.entry .entry-content .wp-block-cover h4.has-text-align-right,
+.entry .entry-content .wp-block-cover h5.has-text-align-right,
+.entry .entry-content .wp-block-cover h6.has-text-align-right {
+  text-align: right;
+}
+
 .entry .entry-content .wp-block-cover-image h1,
 .entry .entry-content .wp-block-cover h1 {
   font-size: 2.25em;
@@ -4385,7 +4415,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-primary-background-color,
 .entry .entry-content .has-secondary-background-color,
-.entry .entry-content .has-dark-gray-background-color,
+.entry .entry-content .has-white-background-color,
 .entry .entry-content .has-light-gray-background-color {
   color: #080808;
 }
@@ -4406,14 +4436,14 @@ body.page .main-navigation {
 .entry .entry-content .has-secondary-background-color h5,
 .entry .entry-content .has-secondary-background-color h6,
 .entry .entry-content .has-secondary-background-color a,
-.entry .entry-content .has-dark-gray-background-color p,
-.entry .entry-content .has-dark-gray-background-color h1,
-.entry .entry-content .has-dark-gray-background-color h2,
-.entry .entry-content .has-dark-gray-background-color h3,
-.entry .entry-content .has-dark-gray-background-color h4,
-.entry .entry-content .has-dark-gray-background-color h5,
-.entry .entry-content .has-dark-gray-background-color h6,
-.entry .entry-content .has-dark-gray-background-color a,
+.entry .entry-content .has-white-background-color p,
+.entry .entry-content .has-white-background-color h1,
+.entry .entry-content .has-white-background-color h2,
+.entry .entry-content .has-white-background-color h3,
+.entry .entry-content .has-white-background-color h4,
+.entry .entry-content .has-white-background-color h5,
+.entry .entry-content .has-white-background-color h6,
+.entry .entry-content .has-white-background-color a,
 .entry .entry-content .has-light-gray-background-color p,
 .entry .entry-content .has-light-gray-background-color h1,
 .entry .entry-content .has-light-gray-background-color h2,
@@ -4425,18 +4455,18 @@ body.page .main-navigation {
   color: #080808;
 }
 
-.entry .entry-content .has-white-background-color {
+.entry .entry-content .has-dark-gray-background-color {
   color: #fff;
 }
 
-.entry .entry-content .has-white-background-color p,
-.entry .entry-content .has-white-background-color h1,
-.entry .entry-content .has-white-background-color h2,
-.entry .entry-content .has-white-background-color h3,
-.entry .entry-content .has-white-background-color h4,
-.entry .entry-content .has-white-background-color h5,
-.entry .entry-content .has-white-background-color h6,
-.entry .entry-content .has-white-background-color a {
+.entry .entry-content .has-dark-gray-background-color p,
+.entry .entry-content .has-dark-gray-background-color h1,
+.entry .entry-content .has-dark-gray-background-color h2,
+.entry .entry-content .has-dark-gray-background-color h3,
+.entry .entry-content .has-dark-gray-background-color h4,
+.entry .entry-content .has-dark-gray-background-color h5,
+.entry .entry-content .has-dark-gray-background-color h6,
+.entry .entry-content .has-dark-gray-background-color a {
   color: #fff;
 }
 
@@ -4452,7 +4482,7 @@ body.page .main-navigation {
 
 .entry .entry-content .has-dark-gray-background-color,
 .entry .entry-content .wp-block-pullquote.is-style-solid-color.has-dark-gray-background-color {
-  background-color: #fff;
+  background-color: #1c1c1c;
 }
 
 .entry .entry-content .has-light-gray-background-color,

Some files were not shown because too many files changed in this diff