Repository navigation
fix(admin): scope body colors and mobile dialog sizing to admin pages #3867
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.
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
Open
masonjames
wants to merge
3
commits into
emdash-cms:main
Choose a base branch
from
masonjames:codex/admin-page-css
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−3
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@emdash-cms/admin": patch | ||
| --- | ||
|
|
||
| Fixes admin body colors and mobile dialog width limits overriding public themes when the admin stylesheet is loaded on a public page. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { afterEach, beforeEach, expect, it } from "vitest"; | ||
| import { page } from "vitest/browser"; | ||
|
|
||
| import "../dist/styles.css"; | ||
|
masonjames marked this conversation as resolved.
|
||
|
|
||
| let theme: HTMLStyleElement; | ||
| let root: HTMLDivElement; | ||
|
|
||
| beforeEach(() => { | ||
| theme = document.createElement("style"); | ||
| theme.textContent = `@layer theme { | ||
| body { background-color: rgb(12, 34, 56); color: rgb(210, 220, 230); } | ||
| [role="dialog"] { position: fixed; inset: 0; width: 100vw; } | ||
| }`; | ||
| document.head.append(theme); | ||
| root = document.createElement("div"); | ||
| document.body.append(root); | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
| theme.remove(); | ||
| root.remove(); | ||
| await page.viewport(1280, 800); | ||
| }); | ||
|
|
||
| it("preserves a public theme's layered body colors when admin CSS is loaded", () => { | ||
| expect(getComputedStyle(document.body).backgroundColor).toBe("rgb(12, 34, 56)"); | ||
| expect(getComputedStyle(document.body).color).toBe("rgb(210, 220, 230)"); | ||
| }); | ||
|
|
||
| it("preserves a public full-width mobile dialog when admin CSS is loaded", async () => { | ||
| await page.viewport(375, 800); | ||
| const dialog = document.createElement("div"); | ||
| dialog.setAttribute("role", "dialog"); | ||
| root.append(dialog); | ||
| expect(dialog.getBoundingClientRect().width).toBe(375); | ||
| }); | ||
|
|
||
| it("keeps portaled admin dialogs within the mobile viewport", async () => { | ||
| await page.viewport(375, 800); | ||
| root.id = "admin-root"; | ||
| const portal = document.createElement("div"); | ||
| const dialog = document.createElement("div"); | ||
| dialog.setAttribute("role", "dialog"); | ||
| dialog.style.minWidth = "512px"; | ||
| portal.append(dialog); | ||
| document.body.append(portal); | ||
| try { | ||
| expect(dialog.getBoundingClientRect().width).toBe(343); | ||
| } finally { | ||
| portal.remove(); | ||
| } | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.