Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix email upsell page styles in site context #98152

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Fix email upsell page styles in site context #98152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9467b5d
Move style to be loaded in all views
Imran92 Jan 8, 2025
6b9f0b4
Fix email upsell page styles in site context
Imran92 Jan 9, 2025
2a64fc2
Fix context menu not loading
Imran92 Jan 9, 2025
8738a43
Fix unit test failing
Imran92 Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/my-sites/domains/domain-management/domain-overview-pane/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,4 @@
height: 100%;
}
}
}
}
2 changes: 1 addition & 1 deletion client/my-sites/email/email-management/email-home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
3 changes: 2 additions & 1 deletion client/my-sites/email/email-management/home/email-plan-mailboxes-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down Expand Up @@ -156,6 +156,7 @@ function EmailPlanMailboxesList( {
// Rendering based on the context
switch ( context ) {
case 'domains':
case 'hosting-overview':
return (
<>
{ ( isGoogleConfiguring || isAccountWarningPresent ) && (
Expand Down
9 changes: 8 additions & 1 deletion client/sites/components/dotcom-style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
padding-right: 0;
overflow-y: initial;
max-height: initial;
max-width: 1400px;
width: 100%;
}

Expand Down Expand Up @@ -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,
Expand Down
Loading