Opt to make Yoast adminbar CSS dependent on core admin-bar CSS

Author: westonruter

admin/class-admin-asset-manager.php

@@ -706,6 +706,9 @@ protected function styles_to_be_registered() {
 			array(
 				'name' => 'adminbar',
 				'src'  => 'adminbar-' . $flat_version,
+				'deps' => array(
+					'admin-bar',
+				),
 			),
 			array(
 				'name' => 'primary-category',

inc/class-wpseo-admin-bar-menu.php

@@ -115,19 +115,6 @@ public function enqueue_assets() {
 		$this->asset_manager->enqueue_style( 'adminbar' );
 	}
 
-	/**
-	 * Filter the XPaths for which elements should get the data-ampdevmode attribute.
-	 *
-	 * Note that the data-ampdevmode attribute could alternatively be added via the style_loader_tag filter.
-	 *
-	 * @param string[] $xpaths XPaths.
-	 * @return string[] XPaths.
-	 */
-	public function filter_amp_dev_mode_element_xpaths( $xpaths ) {
-		$xpaths[] = '//link[ @id = "yoast-seo-adminbar-css" ]';
-		return $xpaths;
-	}
-
 	/**
 	 * Registers the hooks.
 	 *
@@ -142,8 +129,6 @@ public function register_hooks() {
 
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
-
-		add_filter( 'amp_dev_mode_element_xpaths', array( $this, 'filter_amp_dev_mode_element_xpaths' ) );
 	}
 
 	/**