Skip to content

My Jetpack: adopt jetpack-admin-page-layout mixin on the main page #48503

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

Merged
CGastrell merged 2 commits into from
May 5, 2026
Merged

My Jetpack: adopt jetpack-admin-page-layout mixin on the main page #48503

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
2ee1a5c
My Jetpack: adopt jetpack-admin-page-layout mixin on the main page
CGastrell May 4, 2026
7411c22
Stylelint: blank line for nested at-rule + drop empty // separator
CGastrell May 4, 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
12 changes: 0 additions & 12 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
Expand Up @@ -32,24 +32,12 @@
}

.footer {
width: 100vw;
margin-inline-start: calc(-50vw + 50%);
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 Down
12 changes: 0 additions & 12 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
Expand Up @@ -10,23 +10,11 @@
}

.footer {
width: 100vw;
margin-inline-start: calc(-50vw + 50%);
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 {
Expand Down
4 changes: 0 additions & 4 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 @@ -35,10 +35,6 @@

.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 {
Expand Down
22 changes: 14 additions & 8 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,14 +1,20 @@
@use "@automattic/jetpack-base-styles/admin-page-layout" as *;

:global {

// Hello Dolly compatibility fix
body.jetpack_page_my-jetpack p#dolly {
position: absolute;
inset-inline-end: 0;
z-index: 2;
// Apply the shared admin-page-layout mixin so the main My Jetpack page
// (sticky header, internally scrollable middle, JetpackFooter pinned at
// viewport bottom) matches Boost / Protect / VideoPress / Search /
// Newsletter / Publicize / Backup / Jetpack network admin / AI.

@media (max-width: 782px) {
padding-inline-end: 10px;
}
// Excluded: My Jetpack's `.jetpack-admin-full-screen` interstitial mode,
// which hides the admin bar and takes over the whole viewport; its
// existing rules (further down in this file) override wp-admin chrome
// directly and should keep doing so. The `:has(.jetpack-admin-full-screen)`
// selector scopes the mixin to the regular dashboard view only.
body.jetpack_page_my-jetpack:not(:has(.jetpack-admin-full-screen)) {

@include jetpack-admin-page-layout;
}

#my-jetpack-container {
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/my-jetpack/changelog/my-jetpack-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 the shared `jetpack-admin-page-layout` mixin on the main dashboard page so its layout (sticky header, internally scrollable middle, JetpackFooter pinned at viewport bottom) matches the rest of the Jetpack admin pages. Drop the bespoke Hello Dolly position-absolute override — Dolly now uses the same centralized normalize as every other Jetpack admin page. The full-width tab separator no longer uses `width: 100vw` (which overflowed the new viewport-fitted column by the wp-admin sidebar width); it now spans the page column instead. Interstitial / full-screen mode (`.jetpack-admin-full-screen`) is intentionally excluded from the mixin so it keeps its current take-over-the-viewport behavior.
Loading