From 59e58199e5f28f0b1e5f25c848728495f0237f14 Mon Sep 17 00:00:00 2001
From: Ian Dunn <iandunn@git.wordpress.org>
Date: Thu, 10 May 2018 03:02:03 +0000
Subject: [PATCH] Privacy: Reposition admin pointer to avoid covering collapsed
 menu.

Previously the pointer overlapped the menu in order to draw attention to the fact that it applies to both the `Tools` and `Settings` menus. That caused a conflict if the menu was collapsed, though, because the icons were covered by the pointer and therefore inaccessible.

Additionally, minor tweaks were made to the text order and formatting. The order of the two sections was swapped in the title and paragraph, in order to match the order of the corresponding menu items. The spacing around headings and paragraphs was tweaked to remove extraneous whitespace.

Props littler.chicken, desrosj, ianbelanger, melchoyce.
Fixes #43961.


git-svn-id: https://develop.svn.wordpress.org/trunk@43210 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-internal-pointers.php | 8 +++-----
 src/wp-includes/css/wp-pointer.css                   | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-internal-pointers.php b/src/wp-admin/includes/class-wp-internal-pointers.php
index 30f3d85db1..de9c3ef8e2 100644
--- a/src/wp-admin/includes/class-wp-internal-pointers.php
+++ b/src/wp-admin/includes/class-wp-internal-pointers.php
@@ -161,23 +161,21 @@ final class WP_Internal_Pointers {
 	 * @since 4.9.6
 	 */
 	public static function pointer_wp496_privacy() {
-		$content  = '<h3>' . __( 'Privacy and Personal Data' ) . '</h3>';
-		$content .= '<h4>' . __( 'Privacy Policy' ) . '</h4>';
-		$content .= '<p>' . __( 'Create or select your site&#8217;s privacy policy page under <strong>Settings &gt; Privacy</strong> to keep your users informed and aware.' ) . '</p>';
+		$content  = '<h3>' . __( 'Personal Data and Privacy' ) . '</h3>';
 		$content .= '<h4>' . __( 'Personal Data Export and Erasure' ) . '</h4>';
 		$content .= '<p>' . __( 'New <strong>Tools</strong> have been added to help you with personal data export and erasure requests.' ) . '</p>';
+		$content .= '<h4>' . __( 'Privacy Policy' ) . '</h4>';
+		$content .= '<p>' . __( 'Create or select your site&#8217;s privacy policy page under <strong>Settings &gt; Privacy</strong> to keep your users informed and aware.' ) . '</p>';
 
 		if ( is_rtl() ) {
 			$position = array(
 				'edge'  => 'right',
 				'align' => 'left',
-				'at'    => 'left+40',
 			);
 		} else {
 			$position = array(
 				'edge'  => 'left',
 				'align' => 'right',
-				'at'    => 'right-40 bottom'
 			);
 		}
 
diff --git a/src/wp-includes/css/wp-pointer.css b/src/wp-includes/css/wp-pointer.css
index a0be97b4cc..f1856d995c 100644
--- a/src/wp-includes/css/wp-pointer.css
+++ b/src/wp-includes/css/wp-pointer.css
@@ -37,11 +37,12 @@
 }
 
 .wp-pointer-content h4 {
-	margin: 1.33em 15px;
+	margin: 1.33em 20px 1em;
+	font-size: 1.15em;
 }
 
 .wp-pointer-content p {
-	padding: 0 15px;
+	padding: 0 20px;
 }
 
 .wp-pointer-buttons {