From 512fe2b90fe6b7bb8e69bc9bf39c3871ba928692 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Thu, 10 May 2018 16:01:50 +0000
Subject: [PATCH] Privacy: fix styling on personal data tables.

Props melchoyce, allendav.
Fixes #43909.

git-svn-id: https://develop.svn.wordpress.org/trunk@43216 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/forms.css | 24 ++++++++++++++----------
 src/wp-admin/js/xfn.js     | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index ab0a1cfc6e..2e47430f06 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -1115,11 +1115,23 @@ table.form-table td .updated p {
 	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
 }
 
+.privacy_requests tbody .has-request-results th {
+	box-shadow: none;
+}
+
+.privacy_requests tbody .request-results th .notice {
+	margin: 0 0 5px;
+}
+
 .privacy_requests tbody td {
 	background: #fff;
 	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
 }
 
+.privacy_requests tbody .has-request-results td {
+	box-shadow: none;
+}
+
 .privacy_requests .status-request-confirmed th,
 .privacy_requests .status-request-confirmed td {
 	background-color: #f7fcfe;
@@ -1132,16 +1144,8 @@ table.form-table td .updated p {
 	border-left-color: #d64d21;
 }
 
-.privacy_requests .request-results .notice {
-	margin: -2px 0 0;
-}
-
-.privacy_requests .request-results .notice p {
-	margin: 0.5em 0;
-}
-
-.request-results td {
-	padding: 0 0 1px;
+.privacy_requests .export_personal_data_failed a {
+	vertical-align: baseline;
 }
 
 .status-label {
diff --git a/src/wp-admin/js/xfn.js b/src/wp-admin/js/xfn.js
index d8d28bc7a2..9933592e9f 100644
--- a/src/wp-admin/js/xfn.js
+++ b/src/wp-admin/js/xfn.js
@@ -31,13 +31,16 @@ jQuery( document ).ready( function( $ ) {
 	}
 
 	function clearResultsAfterRow( $requestRow ) {
+		$requestRow.removeClass( 'has-request-results' );
+
 		if ( $requestRow.next().hasClass( 'request-results' ) ) {
 			$requestRow.next().remove();
 		}
 	}
 
 	function appendResultsAfterRow( $requestRow, classes, summaryMessage, additionalMessages ) {
-		var itemList = '';
+		var itemList = '',
+			resultRowClasses = 'request-results';
 
 		clearResultsAfterRow( $requestRow );
 
@@ -48,8 +51,18 @@ jQuery( document ).ready( function( $ ) {
 			itemList = '<ul>' + itemList + '</ul>';
 		}
 
+		$requestRow.addClass( 'has-request-results' );
+
+		if ( $requestRow.hasClass( 'status-request-confirmed' ) ) {
+			resultRowClasses = resultRowClasses + ' status-request-confirmed';
+		}
+
+		if ( $requestRow.hasClass( 'status-request-failed' ) ) {
+			resultRowClasses = resultRowClasses + ' status-request-failed';
+		}
+
 		$requestRow.after( function() {
-			return '<tr class="request-results"><td colspan="5">' +
+			return '<tr class="' + resultRowClasses + '"><th colspan="5">' +
 				'<div class="notice inline notice-alt ' + classes + '">' +
 				'<p>' + summaryMessage + '</p>' +
 				itemList +