Merge remote-tracking branch 'upstream/trunk' into rtc/avoid-duplicate-room-split

Author: dmsnell

composer.json

@@ -32,6 +32,11 @@
 		},
 		"lock": false
 	},
+	"autoload-dev": {
+		"psr-4": {
+			"WordPress\\PHPStan\\": "tests/phpstan/"
+		}
+	},
 	"scripts": {
 		"phpstan": "@php ./vendor/bin/phpstan analyse --memory-limit=2G",
 		"compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source",

package-lock.json

@@ -113,7 +113,6 @@
 		"wicg-inert": "3.1.3"
 	},
 	"scripts": {
-		"postinstall": "npm run gutenberg:verify",
 		"build": "grunt build",
 		"build:dev": "grunt build --dev",
 		"build:gutenberg": "grunt build:gutenberg",

package.json

@@ -475,13 +475,13 @@ ul#adminmenu > li.current > a.current:after {
 #wpadminbar .quicklinks li a:focus .blavatar,
 #wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
 #wpadminbar .menupop .menupop > .ab-item:hover:before,
-#wpadminbar.mobile .quicklinks .ab-icon:before,
-#wpadminbar.mobile .quicklinks .ab-item:before {
+#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
+#wpadminbar.mobile .quicklinks .hover .ab-item:before {
 	color: variables.$menu-submenu-focus-text;
 }
 
-#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
-#wpadminbar.mobile .quicklinks .hover .ab-item:before {
+#wpadminbar.mobile .quicklinks .ab-icon:before,
+#wpadminbar.mobile .quicklinks .ab-item:before {
 	color: variables.$menu-icon;
 }
 

src/wp-admin/css/colors/_admin.scss

@@ -829,7 +829,7 @@ img.emoji {
 	border-radius: 50%;
 	color: var(--wp-admin-theme-color, #3858e9);
 	/* vertically center the icon cross browsers */
-	line-height: 1.28;
+	line-height: 1.1;
 }
 
 .tagchecklist .ntdelbutton:focus {
@@ -961,7 +961,6 @@ a#remove-post-thumbnail:hover,
 
 #publishing-action .spinner {
 	float: none;
-	margin-top: 5px;
 }
 
 #misc-publishing-actions {
@@ -2460,7 +2459,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 	filter: alpha(opacity=70);
 	width: 20px;
 	height: 20px;
-	margin: 4px 10px 0;
+	margin: 10px 10px 0;
 }
 
 .spinner.is-active,
@@ -2480,6 +2479,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
 }
 #template .submit .spinner {
 	float: none;
+	vertical-align: top;
 }
 
 .metabox-holder .stuffbox > h3, /* Back-compat for pre-4.4 */

src/wp-admin/css/common.css

@@ -70,7 +70,7 @@ body {
 
 #customize-save-button-wrapper {
 	float: right;
-	margin-top: 3px; /* Vertically center 40px button in 45px header */
+	margin-top: 7px; /* Vertically center 32px button in 45px header */
 }
 
 body:not(.ready) #customize-save-button-wrapper .save {
@@ -572,6 +572,10 @@ body.trashing #publish-settings {
 	display: block;
 }
 
+.accordion-section-title button.accordion-trigger .spinner {
+	margin-top: 0;
+}
+
 @media (prefers-reduced-motion: reduce) {
 	#customize-theme-controls .accordion-section-title,
 	#customize-outer-theme-controls .accordion-section-title {
@@ -2996,9 +3000,8 @@ body.adding-widget .add-new-widget:before,
 	}
 
 	.wp-core-ui.wp-customizer .button {
-		min-height: 30px;
 		padding: 0 14px;
-		line-height: 2;
+		line-height: 2.14285714; /* 30px */
 		font-size: 14px;
 		vertical-align: middle;
 	}

src/wp-admin/css/customize-controls.css

@@ -60,7 +60,6 @@
 	/* Required min-height to make the jQuery UI Sortable drop zone work. */
 	min-height: 0;
 	margin: 0 8px 20px;
-	padding: 0;
 }
 
 #dashboard-widgets .meta-box-sortables:not(:empty) {

src/wp-admin/css/dashboard.css

@@ -173,10 +173,6 @@ body.post-type-wp_navigation .inline-edit-status {
 
 /* Post Screen */
 
-.metabox-holder .postbox-container .meta-box-sortables {
-	padding: 4px;
-}
-
 /* Only highlight drop zones when dragging and only in the 2 columns layout. */
 .is-dragging-metaboxes .metabox-holder .postbox-container .meta-box-sortables {
 	border-radius: 8px;

src/wp-admin/css/edit.css

@@ -1104,6 +1104,7 @@ tr.inline-edit-row td {
 }
 
 .inline-edit-row select {
+	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding-right: 24px;
 }
 
@@ -1609,7 +1610,7 @@ div.action-links,
 }
 
 .plugin-card h3 {
-	margin: 0 12px 12px 0;
+	margin: 0 12px 16px 0;
 	font-size: 18px;
 	line-height: 1.3;
 }

src/wp-admin/css/list-tables.css

@@ -1967,7 +1967,7 @@ body.full-overlay-active {
 
 .theme-install-overlay .wp-full-overlay-header .button {
 	float: right;
-	margin: 3px 10px 0 0; /* Vertically center 40px button in 45px header */
+	margin: 7px 10px 0 0; /* Vertically center 32px button in 45px header */
 }
 
 .theme-install-overlay .wp-full-overlay-sidebar {
@@ -2053,8 +2053,6 @@ body.full-overlay-active {
 
 	.theme-install-overlay .wp-full-overlay-header .button {
 		font-size: 13px;
-		line-height: 2.15384615;
-		min-height: 30px;
 	}
 
 	.theme-browser .theme .theme-actions .button {