Merge branch 'trunk' into update/blank-canvas-patterns

blank-canvas/assets/customizer.css

@@ -0,0 +1,16 @@
+/**
+ * Customizer CSS
+ *
+ * Adjusts the theme's message about the site branding display to appear like a notice.
+ */
+
+#sub-accordion-section-title_tagline .customize-section-description {
+	background: #FFF;
+	border: 1px solid #ccd0d4;
+	border-left: 4px solid #00a0d2;
+	box-shadow: 0 1px 1px rgba( 0, 0, 0, .04 );
+	margin: 15px 0 6px 0;
+	padding: 9px 14px;
+	overflow: hidden;
+	width: auto;
+}

blank-canvas/functions.php

@@ -168,3 +168,10 @@ add_action( 'wp_enqueue_scripts', 'blank_canvas_enqueue', 11 );
  */
 require get_stylesheet_directory() . '/inc/block-patterns.php';
 
+/**
+ * Enqueue CSS for Customizer message.
+ */
+function blank_canvas_customizer_enqueue() {
+	wp_enqueue_style( 'blank-canvas-customizer-style', get_stylesheet_directory_uri() . '/assets/customizer.css', array(), wp_get_theme()->get( 'Version' ) );
+}
+add_action( 'customize_controls_enqueue_scripts', 'blank_canvas_customizer_enqueue' );

independent-publisher-2/style.css

@@ -1,7 +1,7 @@
 /*
 Theme Name: Independent Publisher 2
 Theme URI: http://wordpress.com/themes/independent-publisher-2
-Version: 2.1.9-wpcom
+Version: 2.1.10-wpcom
 Description: Independent Publisher 2 is a clean and polished theme with a light color scheme, bold typography, and full-width images.
 Author: Raam Dev
 Author URI: http://raamdev.com/

seedlet/assets/css/style-editor.css

@@ -499,10 +499,6 @@ object {
 	border-radius: 0;
 }
 
-div[data-type="core/button"] {
-	display: block;
-}
-
 /**
  * Calendar
  */

seedlet/assets/sass/blocks/button/_editor.scss

@@ -30,7 +30,3 @@
 		border-radius: 0;
 	}
 }
-
-div[data-type="core/button"] {
-	display: block;
-}

seedlet/classes/class-seedlet-custom-colors.php

@@ -262,8 +262,9 @@ class Seedlet_Custom_Colors {
 	 * Customizer & frontend custom color variables.
 	 */
 	function seedlet_custom_color_variables() {
+		wp_enqueue_style( 'seedlet-custom-color-overrides', get_template_directory_uri() . '/assets/css/custom-color-overrides.css', array(), wp_get_theme()->get( 'Version' ) );
 		if ( 'default' !== get_theme_mod( 'custom_colors_active' ) ) {
-			wp_add_inline_style( 'seedlet-style', $this->seedlet_generate_custom_color_variables() );
+			wp_add_inline_style( 'seedlet-custom-color-overrides', $this->seedlet_generate_custom_color_variables() );
 		}
 	}
 

seedlet/classes/class-seedlet-svg-icons.php

@@ -152,6 +152,9 @@ class Seedlet_SVG_Icons {
 			'wordpress.com',
 			'wordpress.org',
 		),
+		'phone' => array(
+			'tel:',
+		),
 	);
 
 	/**
@@ -236,6 +239,8 @@ class Seedlet_SVG_Icons {
 
 		'youtube'    => '<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"></path></svg>',
 
+		'phone'      => '<svg viewBox="-5 -5 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1 1l1 4.5L4 3 3 1H1zm7.5 11l4.5 1v-2l-2-1-2.5 2z" fill="currentColor"/><path d="M2 5.5l-.732.163a.75.75 0 001.318.306L2 5.5zM1 1V.25a.75.75 0 00-.732.913L1 1zm3 2l.586.469a.75.75 0 00.085-.804L4 3zM3 1l.67-.335A.75.75 0 003 .25V1zm10 12l-.163.732A.75.75 0 0013.75 13H13zm-4.5-1l-.469-.586a.75.75 0 00.306 1.318L8.5 12zm4.5-1h.75a.75.75 0 00-.415-.67L13 11zm-2-1l.335-.67a.75.75 0 00-.804.084L11 10zM2.732 5.337l-1-4.5-1.464.326 1 4.5 1.464-.326zm.682-2.806l-2 2.5 1.172.938 2-2.5-1.172-.938zM2.33 1.335l1 2 1.342-.67-1-2-1.342.67zM1 1.75h2V.25H1v1.5zm12.163 10.518l-4.5-1-.326 1.464 4.5 1 .326-1.464zM12.25 11v2h1.5v-2h-1.5zm-1.585-.33l2 1 .67-1.34-2-1-.67 1.34zm-1.696 1.916l2.5-2-.938-1.172-2.5 2 .938 1.172zM.25 1C.25 8.042 5.958 13.75 13 13.75v-1.5C6.787 12.25 1.75 7.213 1.75 1H.25z"></path></svg>',
+
 	);
 
 }

seedlet/inc/jetpack.php

@@ -14,9 +14,6 @@
  * See: https://jetpack.com/support/responsive-videos/
  */
 function seedlet_jetpack_setup() {
-	// Add theme support for Responsive Videos.
-	add_theme_support( 'jetpack-responsive-videos' );
-
 	// Add theme support for Content Options.
 	add_theme_support( 'jetpack-content-options', array(
 		'author-bio' => true,

spearhead/functions.php

@@ -120,7 +120,9 @@ function spearhead_scripts() {
 	wp_enqueue_style( 'spearhead-fonts', spearhead_fonts_url(), array(), null );
 
 	// Child theme variables
+	wp_dequeue_style( 'seedlet-custom-color-overrides' );
 	wp_enqueue_style( 'spearhead-variables-style', get_stylesheet_directory_uri() . '/variables.css', array(), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'seedlet-custom-color-overrides' );
 
 	// enqueue child styles
 	wp_enqueue_style( 'spearhead-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );

varia/classes/class-varia-svg-icons.php

@@ -222,6 +222,9 @@ class Varia_SVG_Icons {
 		'mail'        => array(
 			'mailto:',
 		),
+		'phone'		  => array(
+			'tel:',
+		),
 		'slideshare'  => array(
 			'slideshare.net',
 		),
@@ -465,6 +468,11 @@ class Varia_SVG_Icons {
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 	<path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"></path>
 </svg>',
+		
+		'phone'       => '
+<svg viewBox="-5 -5 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M1 1l1 4.5L4 3 3 1H1zm7.5 11l4.5 1v-2l-2-1-2.5 2z" fill="currentColor"/><path d="M2 5.5l-.732.163a.75.75 0 001.318.306L2 5.5zM1 1V.25a.75.75 0 00-.732.913L1 1zm3 2l.586.469a.75.75 0 00.085-.804L4 3zM3 1l.67-.335A.75.75 0 003 .25V1zm10 12l-.163.732A.75.75 0 0013.75 13H13zm-4.5-1l-.469-.586a.75.75 0 00.306 1.318L8.5 12zm4.5-1h.75a.75.75 0 00-.415-.67L13 11zm-2-1l.335-.67a.75.75 0 00-.804.084L11 10zM2.732 5.337l-1-4.5-1.464.326 1 4.5 1.464-.326zm.682-2.806l-2 2.5 1.172.938 2-2.5-1.172-.938zM2.33 1.335l1 2 1.342-.67-1-2-1.342.67zM1 1.75h2V.25H1v1.5zm12.163 10.518l-4.5-1-.326 1.464 4.5 1 .326-1.464zM12.25 11v2h1.5v-2h-1.5zm-1.585-.33l2 1 .67-1.34-2-1-.67 1.34zm-1.696 1.916l2.5-2-.938-1.172-2.5 2 .938 1.172zM.25 1C.25 8.042 5.958 13.75 13 13.75v-1.5C6.787 12.25 1.75 7.213 1.75 1H.25z"></path>
+</svg>',
 
 	);
 

varia/package.json

@@ -1,6 +1,6 @@
 {
   "name": "varia",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "description": "A variable-based design system for WordPress sites built with Gutenberg.",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues?q=is%3Aopen+is%3Aissue+label%3Avaria"