Merge remote-tracking branch 'origin/trunk' into 8535-add-network-fea…

…ture-toggles

.travis.yml

@@ -38,6 +38,7 @@ jobs:
     - php: nightly
       env: WP_VERSION=master
     - stage: 🚀 deployment
+      name: "Deploy to S3"
       if: branch = deploy # Only build when on the `deploy` branch, this functionality is not used yet and is taking a long time to complete.
       env: SC_ATTR=wordpress-seo
       before_script: skip
@@ -59,6 +60,7 @@ jobs:
           repo: Yoast/wordpress-seo
           all_branches: true
     - stage: 🚀 deployment
+      name: "Deploy to Yoast-dist"
       install:
         - yarn global add grunt-cli
         - yarn install

admin/class-admin-asset-manager.php

@@ -210,8 +210,20 @@ protected function scripts_to_be_registered() {
 				wp_deregister_script( 'tinymce-latest' );
 				wp_register_script( 'tinymce-latest', includes_url( 'js/tinymce/' ) . 'wp-tinymce.php', array( 'jquery' ), false, true );
 			}
+
+			// Use Gutenberg's babel-polyfill.
+			$babel_polyfill = 'wp-polyfill-ecmascript';
 		}
 		else {
+			// If Gutenberg's babel-polyfill is not registered, use our own.
+			if ( ! wp_script_is( 'wp-polyfill-ecmascript', 'registered' ) ) {
+				$this->register_script( new WPSEO_Admin_Asset( array(
+					'name' => 'babel-polyfill',
+					'src'  => 'babel-polyfill-' . $flat_version,
+				) ) );
+			}
+			$babel_polyfill = self::PREFIX . 'babel-polyfill';
+
 			if ( wp_script_is( 'lodash', 'registered' ) ) {
 				$backport_wp_dependencies[] = 'lodash';
 			}
@@ -229,6 +241,7 @@ protected function scripts_to_be_registered() {
 				'name' => 'react-dependencies',
 				// Load webpack-commons for bundle support.
 				'src'  => 'commons-' . $flat_version,
+				'deps' => array( $babel_polyfill ),
 			),
 			array(
 				'name' => 'search-appearance',

admin/config-ui/fields/class-field-separator.php

@@ -22,6 +22,7 @@ public function __construct() {
 		$this->add_choice( 'sc-dash', '-', __( 'Dash', 'wordpress-seo' ) );
 		$this->add_choice( 'sc-ndash', '–', __( 'En dash', 'wordpress-seo' ) );
 		$this->add_choice( 'sc-mdash', '—', __( 'Em dash', 'wordpress-seo' ) );
+		$this->add_choice( 'sc-colon', ':', __( 'Colon', 'wordpress-seo' ) );
 		$this->add_choice( 'sc-middot', '·', __( 'Middle dot', 'wordpress-seo' ) );
 		$this->add_choice( 'sc-bull', '•', __( 'Bullet', 'wordpress-seo' ) );
 		$this->add_choice( 'sc-star', '*', __( 'Asterisk', 'wordpress-seo' ) );

css/dist/structured-data-blocks-83-RC1-rtl.css

@@ -78,11 +78,18 @@ legend.schema-how-to-duration-legend {
 }
 
 .schema-how-to-step-name,
-.schema-faq-title,
 .schema-faq-question {
 	font-weight: 600;
 }
 
+.schema-how-to-description,
+.schema-how-to-step-name,
+.schema-how-to-step-text,
+.schema-faq-question,
+.schema-faq-answer {
+	line-height: inherit;
+}
+
 .schema-how-to-step-button-container {
 	text-align: left;
 }

css/dist/structured-data-blocks-83-RC1.css

@@ -78,11 +78,18 @@ legend.schema-how-to-duration-legend {
 }
 
 .schema-how-to-step-name,
-.schema-faq-title,
 .schema-faq-question {
 	font-weight: 600;
 }
 
+.schema-how-to-description,
+.schema-how-to-step-name,
+.schema-how-to-step-text,
+.schema-faq-question,
+.schema-faq-answer {
+	line-height: inherit;
+}
+
 .schema-how-to-step-button-container {
 	text-align: right;
 }

css/dist/yst_plugin_tools-83-RC1-rtl.css

@@ -72,7 +72,8 @@ tr.yst_row.even {
 }
 .wpseo_content_wrapper input.textinput,
 .wpseo_content_wrapper textarea.textinput,
-.wpseo_content_wrapper select.select {
+.wpseo_content_wrapper select.select,
+.wpseo_content_wrapper .select2-container {
 	margin: 0 0 15px 0;
 }
 .wpseo_content_wrapper input.radio,