Skip to content

My Jetpack: Adopt jetpack-admin-page-layout mixin #48310

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

Closed
CGastrell wants to merge 2 commits into from
Closed

My Jetpack: Adopt jetpack-admin-page-layout mixin #48310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf29705
My Jetpack: Adopt jetpack-admin-page-layout mixin
CGastrell Apr 24, 2026
7d4b8bd
My Jetpack: rework tab panel so full-width elements are natural siblings
CGastrell Apr 25, 2026
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
63 changes: 39 additions & 24 deletions projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/help/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { getRedirectUrl } from '@automattic/jetpack-components';
import { Button } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import clsx from 'clsx';
import { useCallback } from 'react';
import { FullWidthSeparator } from '../full-width-separator';
import parentStyles from '../styles.module.scss';
import { HelpCards } from './cards';
import { HelpFooter } from './footer';
import styles from './styles.module.scss';
Expand All @@ -21,33 +23,46 @@ export function HelpContent() {
}, [ trackHelpRequest ] );

return (
<section>
<h2>{ __( 'Need assistance?', 'jetpack-my-jetpack' ) }</h2>
<p className={ styles.description }>
{ __(
'Browse our expert guides to get help with setup, features, and troubleshooting.',
'jetpack-my-jetpack'
<>
<section
className={ clsx(
parentStyles[ 'constrained-section' ],
parentStyles[ 'tab-content-wrapper' ]
) }
</p>
<Button
variant="primary"
href={ getRedirectUrl( 'jetpack-support' ) }
target="_blank"
rel="noopener noreferrer"
className={ styles.cta }
onClick={ handleExploreHelpCenterClick }
>
<span>
{ __( 'Explore our Help Center', 'jetpack-my-jetpack' ) }
<span role="presentation" aria-hidden="true">
&nbsp;
{ '↗' }
<h2>{ __( 'Need assistance?', 'jetpack-my-jetpack' ) }</h2>
<p className={ styles.description }>
{ __(
'Browse our expert guides to get help with setup, features, and troubleshooting.',
'jetpack-my-jetpack'
) }
</p>
<Button
variant="primary"
href={ getRedirectUrl( 'jetpack-support' ) }
target="_blank"
rel="noopener noreferrer"
className={ styles.cta }
onClick={ handleExploreHelpCenterClick }
>
<span>
{ __( 'Explore our Help Center', 'jetpack-my-jetpack' ) }
<span role="presentation" aria-hidden="true">
&nbsp;
{ '↗' }
</span>
</span>
</span>
</Button>
<HelpCards />
</Button>
<HelpCards />
</section>

<FullWidthSeparator />
<HelpFooter />
</section>

<div className={ styles.footer }>
<div className={ clsx( parentStyles[ 'constrained-section' ], styles[ 'footer-inner' ] ) }>
<HelpFooter />
</div>
</div>
</>
);
}
26 changes: 1 addition & 25 deletions projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/help/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use "@automattic/jetpack-base-styles/gutenberg-base-styles" as gb;
@use "../styles.module.scss" as parent;

.description {
font-size: 1rem;
Expand Down Expand Up @@ -32,24 +31,9 @@
}

.footer {
width: 100vw;
margin-inline-start: calc(-50vw + 50%);
width: 100%;
background: var(--studio-white, #fff);

/* Center the content within the full-width background */
display: flex;
justify-content: center;

// 1128 + 3rem (96px) = 1224px + 64px (no idea what that is) = 1288px
@media (max-width: 1288px) {
// I have to hardcode --max-container-width because
// media queries don't work with CSS variables
margin-inline-start: -3rem; // Match the parent's padding-inline
margin-inline-end: -3rem;
width: calc(100% + 6rem); // Compensate for the negative margins
padding-inline: 3rem;
}

section {
max-width: 35rem;
}
Expand All @@ -65,14 +49,6 @@
.footer-inner {
padding-top: 2.5rem;
padding-bottom: 1.5rem;
width: 100%;
padding-inline: 3rem;

@include parent.full-width-container;

@media ( max-width: 1288px ) {
padding-inline: 0;
}
}

.footer-learn-more {
Expand Down
33 changes: 21 additions & 12 deletions projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/overview/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { Col, Container } from '@automattic/jetpack-components';
import { currentUserCan } from '@automattic/jetpack-script-data';
import clsx from 'clsx';
import ConnectionsSection from '../../connections-section';
import PlansSection from '../../plans-section';
import ProductCardsSection from '../../product-cards-section';
import { FullWidthSeparator } from '../full-width-separator';
import parentStyles from '../styles.module.scss';
import { A4AUpsell } from './a4a-upsell';
import styles from './styles.module.scss';

Expand All @@ -14,21 +16,28 @@ import styles from './styles.module.scss';
*/
export function OverviewContent() {
return (
<div>
<div className={ styles.products }>
<ProductCardsSection />
</div>

{ currentUserCan( 'manage_options' ) ? (
<div className={ styles[ 'jetpack-manage-upsell' ] }>
<A4AUpsell />
<>
<div
className={ clsx(
parentStyles[ 'constrained-section' ],
parentStyles[ 'tab-content-wrapper' ]
) }
>
<div className={ styles.products }>
<ProductCardsSection />
</div>
) : null }

{ currentUserCan( 'manage_options' ) ? (
<div className={ styles[ 'jetpack-manage-upsell' ] }>
<A4AUpsell />
</div>
) : null }
</div>

<FullWidthSeparator />

<div className={ styles.footer }>
{ /* Needed to show different background colour */ }
<div className={ styles[ 'footer-inner' ] }>
<div className={ clsx( parentStyles[ 'constrained-section' ], styles[ 'footer-inner' ] ) }>
<Container horizontalSpacing={ 0 } className={ styles[ 'footer-container' ] }>
<Col sm={ 4 } md={ 4 } lg={ 6 }>
<PlansSection />
Expand All @@ -39,6 +48,6 @@ export function OverviewContent() {
</Container>
</div>
</div>
</div>
</>
);
}
25 changes: 1 addition & 24 deletions ...ects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/overview/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@use "@automattic/jetpack-base-styles/gutenberg-base-styles" as gb;
@use "../styles.module.scss" as parent;

.products {
margin-bottom: 3rem;
}
Expand All @@ -10,33 +7,13 @@
}

.footer {
width: 100vw;
margin-inline-start: calc(-50vw + 50%);
width: 100%;
background: var(--studio-white, #fff);

/* Center the content within the full-width background */
display: flex;
justify-content: center;

// 1128 + 3rem (96px) = 1224px + 64px (no idea what that is) = 1288px
@media ( max-width: 1288px ) {
// I have to hardcode --max-container-width
// because media queries don't work with CSS variables
margin-inline-start: -3rem; // Match the parent's padding-inline
margin-inline-end: -3rem;
width: calc(100% + 6rem); // Compensate for the negative margins
padding-inline: 3rem;
}
}

.footer-inner {
padding-top: 2.5rem;
padding-bottom: 1.5rem;
margin: 0 auto;
width: 100%;
padding-inline: 3rem;

@include parent.full-width-container;

a,
a.components-external-link,
Expand Down
10 changes: 9 additions & 1 deletion projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { __ } from '@wordpress/i18n';
import clsx from 'clsx';
import parentStyles from '../styles.module.scss';
import { Products } from './products';
import styles from './styles.module.scss';

Expand All @@ -10,7 +11,14 @@ import styles from './styles.module.scss';
*/
const ProductsContent = () => {
return (
<section className={ clsx( styles.content, styles[ 'my-jetpack-products-tab__content' ] ) }>
<section
className={ clsx(
parentStyles[ 'constrained-section' ],
parentStyles[ 'tab-content-wrapper' ],
styles.content,
styles[ 'my-jetpack-products-tab__content' ]
) }
>
<h2>{ __( 'Products', 'jetpack-my-jetpack' ) }</h2>
<p className={ styles.description }>
{ __(
Expand Down
29 changes: 13 additions & 16 deletions projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,23 @@
}
}

.tab-content-wrapper {
padding-block-start: 2.5rem;
@mixin full-width-container {
max-width: var(--max-container-width);
margin: 0 auto;
}

.constrained-section {

@include full-width-container;
padding-inline: 3rem;

@media (max-width: gb.$break-medium ) {
padding-inline: 1.5rem;
}
}

.tab-content-wrapper {
padding-block-start: 2.5rem;

h2 {

Expand All @@ -35,15 +45,7 @@

.full-width-separator {
border-top: 1px solid var(--jp-gray);
width: 100vw;
position: relative;
inset-inline-start: 50%;
margin-inline-start: -50vw;
}

@mixin full-width-container {
max-width: var(--max-container-width);
margin: 0 auto;
width: 100%;
}

.my-jetpack-tab-panel--full-width {
Expand All @@ -64,10 +66,5 @@

:global(.components-tab-panel__tab-content) {
background-color: #fcfcfc;

.my-jetpack-tab-panel-inner {

@include full-width-container;
}
}
}
10 changes: 1 addition & 9 deletions projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/tab-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import clsx from 'clsx';
import { HelpContent } from './help/content';
import { OverviewContent } from './overview/content';
import { ProductsContent } from './products/content';
import styles from './styles.module.scss';
import { MyJetpackSection } from './types';
import type { ComponentType } from 'react';

Expand Down Expand Up @@ -30,11 +28,5 @@ export function TabContent( { name }: TabContentProps ) {
return null;
}

return (
<div className={ styles[ 'my-jetpack-tab-panel-inner' ] }>
<div className={ clsx( styles[ 'tab-content-wrapper' ] ) }>
<ContentComponent />
</div>
</div>
);
return <ContentComponent />;
}
7 changes: 7 additions & 0 deletions projects/packages/my-jetpack/_inc/style.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
@use "@automattic/jetpack-base-styles/admin-page-layout" as *;

:global {

body.jetpack_page_my-jetpack {

@include jetpack-admin-page-layout;
}

// Hello Dolly compatibility fix
body.jetpack_page_my-jetpack p#dolly {
position: absolute;
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/my-jetpack/changelog/adopt-admin-page-layout-mixin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

My Jetpack: Adopt jetpack-admin-page-layout mixin.
4 changes: 4 additions & 0 deletions projects/packages/my-jetpack/changelog/fix-tab-panel-full-width-elements
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

My Jetpack: restructure tab panel so full-width separators and footers no longer rely on viewport-width math, eliminating the horizontal scrollbar that appeared when the page scrollbar was present.
Loading