improve style

WordPress · Oct 30, 2024 · ca3b59b · ca3b59b
1 parent 9806534
commit ca3b59b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 30 deletions.
diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
@@ -130,6 +130,7 @@ $z-layers: (
 	".editor-action-modal": 1000001,
 	".editor-post-template__swap-template-modal": 1000001,
 	".edit-site-template-panel__replace-template-modal": 1000001,
+	".fields-controls__template-modal": 1000001,
 
 	// Note: The ConfirmDialog component's z-index is being set to 1000001 in packages/components/src/confirm-dialog/styles.ts
 	// because it uses emotion and not sass. We need it to render on top its parent popover.

diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
@@ -1,6 +1,5 @@
 @import "../../dataviews/src/style.scss";
-@import "../../fields/src/styles.scss";
-@import "../../fields/src/fields/featured-image/style.scss";
+@import "../../fields/src/style.scss";
 
 @import "./components/add-new-template/style.scss";
 @import "./components/block-editor/style.scss";

diff --git a/packages/fields/src/fields/template/style.scss b/packages/fields/src/fields/template/style.scss
@@ -1,9 +1,8 @@
-.editor-post-template__swap-template-modal {
-	z-index: z-index(".editor-post-template__swap-template-modal");
+.fields-controls__template-modal {
+	z-index: z-index(".fields-controls__template-modal");
 }
 
-.editor-post-template__swap-template-modal-content
-.block-editor-block-patterns-list {
+.fields-controls__template-content .block-editor-block-patterns-list {
 	column-count: 2;
 	column-gap: $grid-unit-30;
 
@@ -22,24 +21,3 @@
 		break-inside: avoid-column;
 	}
 }
-
-.editor-post-template__dropdown {
-	.components-popover__content {
-		min-width: 240px;
-	}
-	.components-button.is-pressed,
-	.components-button.is-pressed:hover {
-		background: inherit;
-		color: inherit;
-	}
-}
-
-.editor-post-template__create-form {
-	@include break-medium() {
-		width: $grid-unit * 40;
-	}
-}
-
-.editor-post-template__classic-theme-dropdown {
-	padding: $grid-unit-10;
-}
diff --git a/packages/fields/src/fields/template/template-edit.tsx b/packages/fields/src/fields/template/template-edit.tsx
@@ -204,10 +204,10 @@ export const TemplateEdit = ( {
 				<Modal
 					title={ __( 'Choose a template' ) }
 					onRequestClose={ () => setShowModal( false ) }
-					overlayClassName="editor-post-template__swap-template-modal"
+					overlayClassName="fields-controls__template-modal"
 					isFullScreen
 				>
-					<div className="editor-post-template__swap-template-modal-content">
+					<div className="fields-controls__template-content">
 						<BlockPatternsList
 							label={ __( 'Templates' ) }
 							blockPatterns={ templatesAsPatterns }

diff --git a/packages/fields/src/style.scss b/packages/fields/src/style.scss
@@ -0,0 +1,3 @@
+@import "./fields/slug/style.scss";
+@import "./fields/featured-image/style.scss";
+@import "./fields/template/style.scss";
diff --git a/packages/fields/src/styles.scss b/packages/fields/src/styles.scss