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

Enhance 404 message styling #69234

Merged
merged 6 commits into from
Feb 20, 2025
Merged

Enhance 404 message styling #69234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5ea507
Enhance 404 message styling with Notice component
Infinite-Null Feb 18, 2025
85bbc58
Improve 404 error message
Infinite-Null Feb 19, 2025
12e3cb4
Merge branch 'trunk' into feat/enhance-404-page-message
Infinite-Null Feb 20, 2025
3c4f9a3
Remove color style from `.edit-site-layout__area__404`
Infinite-Null Feb 20, 2025
f04a461
Update 404 notice implementation with reusable component
Infinite-Null Feb 20, 2025
59195ac
Fixed DOM nesting validation error by replacing p with div
Infinite-Null Feb 20, 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
4 changes: 0 additions & 4 deletions packages/edit-site/src/components/layout/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,6 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
}
}

.edit-site-layout__area__404 {
margin: $canvas-padding;
}

.edit-site .components-editor-notices__snackbar {
position: fixed;
right: 0;
Expand Down
4 changes: 2 additions & 2 deletions packages/edit-site/src/components/sidebar-navigation-screen/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ export default function SidebarNavigationScreen( {
</HStack>
<div className="edit-site-sidebar-navigation-screen__content">
{ description && (
<p className="edit-site-sidebar-navigation-screen__description">
<div className="edit-site-sidebar-navigation-screen__description">
{ description }
</p>
</div>
) }
{ content }
</div>
Expand Down
19 changes: 15 additions & 4 deletions packages/edit-site/src/components/site-editor-routes/notfound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,33 @@ import { __ } from '@wordpress/i18n';
/**
* Internal dependencies
*/
import { Notice, __experimentalSpacer as Spacer } from '@wordpress/components';
import SidebarNavigationScreenMain from '../sidebar-navigation-screen-main';

function NotFoundError() {
return (
<Notice status="error" isDismissible={ false }>
{ __(
'The requested page could not be found. Please check the URL.'
) }
</Notice>
);
}

export const notFoundRoute = {
name: 'notfound',
path: '*',
areas: {
sidebar: <SidebarNavigationScreenMain />,
mobile: (
<SidebarNavigationScreenMain
customDescription={ __( '404 (Not Found)' ) }
customDescription={ <NotFoundError /> }
/>
),
content: (
<p className="edit-site-layout__area__404">
{ __( '404 (Not Found)' ) }
</p>
<Spacer padding={ 2 }>
<NotFoundError />
</Spacer>
),
},
};
Loading