From 8b5181ec6429b5d235a43528486364d072b7a058 Mon Sep 17 00:00:00 2001
From: Christian Gastrell <cgastrell@gmail.com>
Date: Thu, 4 Jun 2026 11:09:55 -0300
Subject: [PATCH] Hello Dolly: retire legacy per-page #dolly rules

Remove the two legacy Hello Dolly rules now that WPDS design tokens load on
every Jetpack admin page (#48750 build-time for the legacy _inc pages,
#49345 runtime for modernized pages):

- `.wp-admin #dolly` (admin-static.scss, static #87a6bc)
- `.jetpack-pagestyles #dolly` (_main.scss, $gray ~= #a1a1a1)

The central `.jetpack-admin-page #dolly` rule (token-based, resolves to
#707070) now governs consistently. The legacy rules only competed with it
at equal specificity. Their `position: relative` used all-zero offsets
(visually identical to static), so removal causes no layout shift; Dolly
converges to #707070 with hello.php's default padding, and the central
rule's `@media (max-width: 659px) { display: none }` already covers the
breakpoint the legacy rules handled.

My Jetpack's `p#dolly { display: none }` and JITM adjacency are untouched.

Verified live on the dev site: Dashboard #dolly computed color #707070,
same top/left/width as baseline (no positioning regression).

Part of #49285 (Phase 4).
---
 .../_inc/client/scss/shared/_main.scss        | 20 -------------------
 .../_inc/client/scss/shared/admin-static.scss | 15 --------------
 .../change-retire-legacy-dolly-rules          |  4 ++++
 3 files changed, 4 insertions(+), 35 deletions(-)
 create mode 100644 projects/plugins/jetpack/changelog/change-retire-legacy-dolly-rules

diff --git a/projects/plugins/jetpack/_inc/client/scss/shared/_main.scss b/projects/plugins/jetpack/_inc/client/scss/shared/_main.scss
index 6f0aa70404a2..53f31e539750 100644
--- a/projects/plugins/jetpack/_inc/client/scss/shared/_main.scss
+++ b/projects/plugins/jetpack/_inc/client/scss/shared/_main.scss
@@ -42,26 +42,6 @@
 	}
 }
 
-// Hello Dolly positioning overwrite
-.jetpack-pagestyles #dolly {
-	float: none;
-	position: relative;
-	right: 0;
-	left: 0;
-	top: 0;
-	padding: rem.convert(10px);
-	text-align: right;
-	background: colors.$white;
-	font-size: rem.convert(12px);
-	font-style: italic;
-	color: colors.$gray;
-	border-bottom: none;
-
-	@include breakpoints.breakpoint( "<660px" ) {
-		display: none;
-	}
-}
-
 .dops-notice__text a {
 	text-decoration: underline;
 }
diff --git a/projects/plugins/jetpack/_inc/client/scss/shared/admin-static.scss b/projects/plugins/jetpack/_inc/client/scss/shared/admin-static.scss
index 4f6026fb7e14..a11924b12242 100644
--- a/projects/plugins/jetpack/_inc/client/scss/shared/admin-static.scss
+++ b/projects/plugins/jetpack/_inc/client/scss/shared/admin-static.scss
@@ -200,18 +200,3 @@
 #jp-plugin-container .wrap .jetpack-wrap-container {
 	margin-top: 1em;
 }
-
-.wp-admin #dolly {
-	float: none;
-	position: relative;
-	right: 0;
-	left: 0;
-	top: 0;
-	padding: 0.625rem;
-	text-align: right;
-	background: #fff;
-	font-size: 0.75rem;
-	font-style: italic;
-	color: #87a6bc;
-	border-bottom: none;
-}
diff --git a/projects/plugins/jetpack/changelog/change-retire-legacy-dolly-rules b/projects/plugins/jetpack/changelog/change-retire-legacy-dolly-rules
new file mode 100644
index 000000000000..124035c68366
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/change-retire-legacy-dolly-rules
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Hello Dolly: retire the legacy per-page `#dolly` color rules so the normalized `.jetpack-admin-page #dolly` treatment (WPDS design token) governs consistently across admin pages.