Merge branch 'develop' into enhancement/#9951-rrm-module-settings.

google · Jan 13, 2025 · 9ba9b20 · 9ba9b20
2 parents fa54013 + 75c014a
commit 9ba9b20
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/assets/js/components/wp-dashboard/WPDashboardPopularPagesGA4.js b/assets/js/components/wp-dashboard/WPDashboardPopularPagesGA4.js
@@ -21,6 +21,7 @@
  */
 import { cloneDeep } from 'lodash';
 import PropTypes from 'prop-types';
+import classnames from 'classnames';
 
 /**
  * WordPress dependencies
@@ -148,7 +149,12 @@ export default function WPDashboardPopularPagesGA4( {
 
 	return (
 		/* TODO: decouple the styles from search-console class */
-		<div className="googlesitekit-search-console-widget">
+		<div
+			className={ classnames( 'googlesitekit-search-console-widget', {
+				'googlesitekit-search-console-widget--empty-data':
+					isGatheringData || ! rows?.length,
+			} ) }
+		>
 			<h3>
 				{ __( 'Top content over the last 28 days', 'google-site-kit' ) }
 			</h3>

diff --git a/assets/sass/components/wp-dashboard/_googlesitekit-wp-dashboard.scss b/assets/sass/components/wp-dashboard/_googlesitekit-wp-dashboard.scss
@@ -115,10 +115,17 @@
 		}
 
 		&.googlesitekit-wp-dashboard-search_console_active_and_connected {
-			min-height: 1080px;
+			min-height: 650px;
 
-			@media (max-width: $bp-mobileOnly) {
-				min-height: 870px;
+			.googlesitekit-search-console-widget {
+
+				&:not(.googlesitekit-search-console-widget--empty-data) {
+					min-height: 430px;
+
+					@media (max-width: $bp-mobileOnly) {
+						min-height: 220px;
+					}
+				}
 			}
 		}
 	}