@wordpress/edit-site 6.48.1 → 6.48.2-next.v.202606191442.0

package/src/components/sidebar-navigation-screen-main/index.js

@@ -19,36 +19,28 @@ import { store as coreStore } from '@wordpress/core-data';
  */
 import SidebarNavigationScreen from '../sidebar-navigation-screen';
 import SidebarNavigationItem from '../sidebar-navigation-item';
-import { SidebarNavigationItemGlobalStyles } from '../sidebar-navigation-screen-global-styles';
-import { SidebarNavigationItemIdentity } from '../sidebar-navigation-screen-identity';
 
 export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 	return (
 		<ItemGroup className="edit-site-sidebar-navigation-screen-main">
 			{ isBlockBasedTheme && (
 				<>
-					<SidebarNavigationItemGlobalStyles
-						to="/styles"
-						uid="global-styles-navigation-item"
-						icon={ styles }
-					>
-						{ __( 'Styles' ) }
-					</SidebarNavigationItemGlobalStyles>
 					<SidebarNavigationItem
-						uid="navigation-navigation-item"
-						to="/navigation"
-						withChevron
-						icon={ navigation }
-					>
-						{ __( 'Navigation' ) }
-					</SidebarNavigationItem>
-					<SidebarNavigationItemIdentity
 						to="/identity"
 						uid="identity-navigation-item"
 						icon={ siteLogo }
+						activeOnRouteName="identity"
 					>
 						{ _x( 'Identity', 'site identity' ) }
-					</SidebarNavigationItemIdentity>
+					</SidebarNavigationItem>
+					<SidebarNavigationItem
+						to="/styles"
+						uid="global-styles-navigation-item"
+						icon={ styles }
+						activeOnRouteName="styles"
+					>
+						{ __( 'Styles' ) }
+					</SidebarNavigationItem>
 					<SidebarNavigationItem
 						uid="page-navigation-item"
 						to="/page"
@@ -58,12 +50,12 @@ export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 						{ __( 'Pages' ) }
 					</SidebarNavigationItem>
 					<SidebarNavigationItem
-						uid="template-navigation-item"
-						to="/template"
+						uid="navigation-navigation-item"
+						to="/navigation"
 						withChevron
-						icon={ layout }
+						icon={ navigation }
 					>
-						{ __( 'Templates' ) }
+						{ __( 'Navigation' ) }
 					</SidebarNavigationItem>
 				</>
 			) }
@@ -85,6 +77,16 @@ export function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {
 			>
 				{ __( 'Patterns' ) }
 			</SidebarNavigationItem>
+			{ isBlockBasedTheme && (
+				<SidebarNavigationItem
+					uid="template-navigation-item"
+					to="/template"
+					withChevron
+					icon={ layout }
+				>
+					{ __( 'Templates' ) }
+				</SidebarNavigationItem>
+			) }
 		</ItemGroup>
 	);
 }

package/src/components/sidebar-navigation-screen-navigation-menu/style.scss

@@ -1,10 +1,10 @@
 .sidebar-navigation__more-menu {
 	.components-button {
-		color: var(--wpds-color-fg-interactive-neutral);
+		color: var(--wpds-color-foreground-interactive-neutral);
 		&:hover,
 		&:focus,
 		&[aria-current] {
-			color: var(--wpds-color-fg-interactive-neutral);
+			color: var(--wpds-color-foreground-interactive-neutral);
 		}
 	}
 }

package/src/components/sidebar-navigation-screen-navigation-menus/style.scss

@@ -23,30 +23,30 @@
 	}
 
 	.block-editor-list-view-block-select-button {
-		color: var(--wpds-color-fg-interactive-neutral-weak);
+		color: var(--wpds-color-foreground-interactive-neutral-weak);
 		&:hover,
 		&:focus,
 		&[aria-current] {
-			color: var(--wpds-color-fg-interactive-neutral-active);
+			color: var(--wpds-color-foreground-interactive-neutral-active);
 		}
 	}
 
 	.block-editor-list-view-block__menu {
-		color: var(--wpds-color-fg-interactive-neutral-weak);
+		color: var(--wpds-color-foreground-interactive-neutral-weak);
 		&:hover,
 		&:focus {
-			color: var(--wpds-color-fg-interactive-neutral-active);
+			color: var(--wpds-color-foreground-interactive-neutral-active);
 		}
 	}
 
 	.block-editor-inserter__toggle {
-		background: var(--wpds-color-bg-interactive-brand-strong);
-		color: var(--wpds-color-fg-interactive-brand-strong);
+		background: var(--wpds-color-background-interactive-brand-strong);
+		color: var(--wpds-color-foreground-interactive-brand-strong);
 
 		&:hover,
 		&:focus {
-			background: var(--wpds-color-bg-interactive-brand-strong-active);
-			color: var(--wpds-color-fg-interactive-brand-strong-active);
+			background: var(--wpds-color-background-interactive-brand-strong-active);
+			color: var(--wpds-color-foreground-interactive-brand-strong-active);
 		}
 	}
 }

package/src/components/sidebar-navigation-screen-patterns/style.scss

@@ -16,7 +16,7 @@
 	margin-top: $grid-unit-20;
 
 	p {
-		color: var(--wpds-color-fg-content-neutral-weak);
+		color: var(--wpds-color-foreground-content-neutral-weak);
 	}
 
 	h2 {

package/src/components/site-hub/style.scss

@@ -24,7 +24,7 @@
 }
 
 .edit-site-site-hub__title .components-button {
-	color: var(--wpds-color-fg-interactive-neutral);
+	color: var(--wpds-color-foreground-interactive-neutral);
 	display: block;
 	flex-grow: 1;
 	font-size: 15px;
@@ -43,7 +43,7 @@
 	&:hover,
 	&:focus,
 	&:active {
-		color: var(--wpds-color-fg-interactive-neutral);
+		color: var(--wpds-color-foreground-interactive-neutral);
 	}
 
 	&:focus {
@@ -54,7 +54,7 @@
 
 	&:focus-visible {
 		// Push the shadow away from the title.
-		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wpds-color-bg-surface-neutral-weak), 0 0 0 calc(2 * var(--wp-admin-border-width-focus)) var(--wp-admin-theme-color);
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wpds-color-background-surface-neutral-weak), 0 0 0 calc(2 * var(--wp-admin-border-width-focus)) var(--wp-admin-theme-color);
 
 		// Windows High Contrast mode will show this outline, but not the box-shadow.
 		outline: 2px solid transparent;
@@ -81,12 +81,12 @@
 }
 
 .edit-site-site-hub_toggle-command-center {
-	color: var(--wpds-color-fg-interactive-neutral);
+	color: var(--wpds-color-foreground-interactive-neutral);
 
 	&:hover,
 	&:active {
 		svg {
-			fill: var(--wpds-color-fg-interactive-neutral-active);
+			fill: var(--wpds-color-foreground-interactive-neutral-active);
 		}
 	}
 }

package/src/components/welcome-guide/page.js

@@ -58,7 +58,7 @@ export default function WelcomeGuidePage() {
 							<p className="edit-site-welcome-guide__text">
 								{ __(
 									// eslint-disable-next-line no-restricted-syntax -- 'sidebar' is a common web design term for layouts
-									'It’s now possible to edit page content in the site editor. To customise other parts of the page like the header and footer switch to editing the template using the settings sidebar.'
+									'It’s now possible to edit page content in the site editor. To customize other parts of the page like the header and footer switch to editing the template using the settings sidebar.'
 								) }
 							</p>
 						</>

package/src/{experimental-admin-bar-in-editor.scss → experimental-omnibar.scss}

@@ -1,5 +1,7 @@
 // Styles for the experimental admin bar in editor.
 
+@use "@wordpress/base-styles/variables" as *;
+
 body.has-admin-bar-in-editor {
 	margin-top: 0;
 	height: 100%;
@@ -22,7 +24,7 @@ body.has-admin-bar-in-editor {
 	}
 
 	.edit-site-sidebar-navigation-screen__title-icon {
-		padding-top: 16px;
+		padding-top: $grid-unit-40;
 	}
 
 	.edit-site-layout__content,

package/src/style.scss

@@ -31,7 +31,7 @@
 @use "./components/resizable-frame/style.scss" as *;
 @use "./components/pagination/style.scss" as *;
 @use "./components/sidebar-global-styles/style.scss" as *;
-@use "./experimental-admin-bar-in-editor.scss" as *;
+@use "./experimental-omnibar.scss" as *;
 
 /* stylelint-disable -- Disable reason: View Transitions not supported properly by stylelint. */
 ::view-transition-image-pair(root) {
@@ -61,7 +61,7 @@ body.js.site-editor-php {
 }
 
 body.js.site-editor-php {
-	background: var(--wpds-color-bg-surface-neutral-weak);
+	background: var(--wpds-color-background-surface-neutral-weak);
 }
 
 .edit-site {