From 9467b5d60ed38901459de59899bb9396afdc9aac Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Wed, 8 Jan 2025 20:47:29 +0600 Subject: [PATCH 1/4] Move style to be loaded in all views --- .../domains/domain-management/domain-overview-pane/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/my-sites/domains/domain-management/domain-overview-pane/style.scss b/client/my-sites/domains/domain-management/domain-overview-pane/style.scss index 190c56c89dabf..bdf471d209617 100644 --- a/client/my-sites/domains/domain-management/domain-overview-pane/style.scss +++ b/client/my-sites/domains/domain-management/domain-overview-pane/style.scss @@ -182,4 +182,4 @@ height: 100%; } } -} \ No newline at end of file +} From 6b9f0b4d93b8a89394500fa9bae070bab2c00d48 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Thu, 9 Jan 2025 20:00:37 +0600 Subject: [PATCH 2/4] Fix email upsell page styles in site context --- client/my-sites/email/email-management/email-home.tsx | 4 ++-- client/sites/components/dotcom-style.scss | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/client/my-sites/email/email-management/email-home.tsx b/client/my-sites/email/email-management/email-home.tsx index 81a51425813b5..d16ddada8d050 100644 --- a/client/my-sites/email/email-management/email-home.tsx +++ b/client/my-sites/email/email-management/email-home.tsx @@ -105,7 +105,7 @@ const EmailHome = ( props: EmailManagementHomeProps ) => { return canCurrentUser( state, selectedSite.ID, 'manage_options' ); } ); const hasSitesLoaded = useSelector( hasLoadedSites ); - const isAllDomainManagementContext = context === 'domains'; + const isAllDomainManagementContext = context === 'domains' || context === 'hosting-overview'; const addEmailForwardMutationActive = useAddEmailForwardMutationIsLoading(); @@ -155,7 +155,7 @@ const EmailHome = ( props: EmailManagementHomeProps ) => { selectedEmailProviderSlug={ selectedEmailProviderSlug } selectedIntervalLength={ selectedIntervalLength } source={ source } - hideNavigation={ isAllDomainManagementContext } + hideNavigation={ isAllDomainManagementContext || isInHostingOverview } /> ); } diff --git a/client/sites/components/dotcom-style.scss b/client/sites/components/dotcom-style.scss index 5fa2c04a4557c..73fbc952f17d3 100644 --- a/client/sites/components/dotcom-style.scss +++ b/client/sites/components/dotcom-style.scss @@ -269,7 +269,6 @@ padding-right: 0; overflow-y: initial; max-height: initial; - max-width: 1400px; width: 100%; } @@ -313,6 +312,14 @@ } } +.wpcom-site .hosting-dashboard-layout.sites-dashboard:not(.domains-overview) .site-preview-pane { + .hosting-dashboard-item-view__content { + > * { + max-width: 1400px; + } + } +} + // Use flexbox to structure of fly-out panel. .wpcom-site .main.hosting-dashboard-layout.sites-dashboard.sites-dashboard__layout:not(.preview-hidden) { &.hosting-dashboard-layout, From 2a64fc213f0c84d63aed7271419e6bae1edaad0e Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Fri, 10 Jan 2025 04:03:40 +0600 Subject: [PATCH 3/4] Fix context menu not loading --- .../email/email-management/home/email-plan-mailboxes-list.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/my-sites/email/email-management/home/email-plan-mailboxes-list.tsx b/client/my-sites/email/email-management/home/email-plan-mailboxes-list.tsx index ee711a0f6f7db..a21cc71609af9 100644 --- a/client/my-sites/email/email-management/home/email-plan-mailboxes-list.tsx +++ b/client/my-sites/email/email-management/home/email-plan-mailboxes-list.tsx @@ -20,7 +20,7 @@ import type { EmailAccount, Mailbox } from 'calypso/data/emails/types'; import type { ResponseDomain } from 'calypso/lib/domains/types'; type Props = { - context: 'domains' | 'email'; + context: 'domains' | 'email' | 'hosting-overview'; domain: ResponseDomain; account: EmailAccount; mailboxes: Mailbox[]; @@ -156,6 +156,7 @@ function EmailPlanMailboxesList( { // Rendering based on the context switch ( context ) { case 'domains': + case 'hosting-overview': return ( <> { ( isGoogleConfiguring || isAccountWarningPresent ) && ( From 8738a432f4dac082636883f65431a3088fc4ab6d Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Fri, 10 Jan 2025 04:22:57 +0600 Subject: [PATCH 4/4] Fix unit test failing --- client/my-sites/email/email-management/email-home.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/my-sites/email/email-management/email-home.tsx b/client/my-sites/email/email-management/email-home.tsx index d16ddada8d050..58da9b57f2967 100644 --- a/client/my-sites/email/email-management/email-home.tsx +++ b/client/my-sites/email/email-management/email-home.tsx @@ -155,7 +155,7 @@ const EmailHome = ( props: EmailManagementHomeProps ) => { selectedEmailProviderSlug={ selectedEmailProviderSlug } selectedIntervalLength={ selectedIntervalLength } source={ source } - hideNavigation={ isAllDomainManagementContext || isInHostingOverview } + hideNavigation={ isAllDomainManagementContext } /> ); }