Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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: 3 additions & 1 deletion packages/base-styles/CHANGELOG.md

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a new package release happened after opening this PR — we'll need to rebase/merge trunk and create a new CHANGELOG entry in the Unreleased section

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Breaking Changes

- Remove the following entries from the `z-index()` helper ([#77619](https://github.com/WordPress/gutenberg/pull/77619), [#77620](https://github.com/WordPress/gutenberg/pull/77620), [#77621](https://github.com/WordPress/gutenberg/pull/77621), [#77714](https://github.com/WordPress/gutenberg/pull/77714), [#77715](https://github.com/WordPress/gutenberg/pull/77715), [#77717](https://github.com/WordPress/gutenberg/pull/77717), [#77774](https://github.com/WordPress/gutenberg/pull/77774)):
- Remove the following entries from the `z-index()` helper ([#77619](https://github.com/WordPress/gutenberg/pull/77619), [#77620](https://github.com/WordPress/gutenberg/pull/77620), [#77621](https://github.com/WordPress/gutenberg/pull/77621), [#77714](https://github.com/WordPress/gutenberg/pull/77714), [#77715](https://github.com/WordPress/gutenberg/pull/77715), [#77717](https://github.com/WordPress/gutenberg/pull/77717), [#77774](https://github.com/WordPress/gutenberg/pull/77774), [#77808](https://github.com/WordPress/gutenberg/pull/77808)):
- `.block-editor-block-contextual-toolbar`
- `.block-editor-block-list__block {core/image aligned wide or fullwide}`
- `.block-editor-block-list__block::before`
Expand All @@ -30,7 +30,9 @@
- `.components-resizable-box__corner-handle`
- `.dataviews-action-modal__quick-edit`
- `.edit-site-editor__toggle-save-panel`
- `.edit-site-sidebar-navigation-screen__title-icon`
- `.edit-site-template-panel__replace-template-modal`
- `.edit-site-templates__dataviews-list-pagination`
- `.edit-widgets-header`
- `.edit-widgets-sidebar {greater than small}`
- `.interface-complementary-area .components-panel`
Expand Down
3 changes: 0 additions & 3 deletions packages/base-styles/_z-index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,9 @@ $z-layers: (
".customize-widgets__block-toolbar": 7,

// Site editor layout
".edit-site-templates__dataviews-list-pagination": 2,
".edit-site-layout__canvas-container": 2,
".edit-site-layout__sidebar": 1,
".edit-site-layout__canvas-container.is-resizing::after": 100,
// Title needs to appear above other UI the section content.
".edit-site-sidebar-navigation-screen__title-icon": 1,

// Ensure modal footer actions appear above modal contents
".editor-start-template-options__modal__actions": 1,
Expand Down
6 changes: 0 additions & 6 deletions packages/edit-site/src/components/page-templates/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
}
}

.edit-site-page-templates {
.dataviews-pagination {
z-index: z-index(".edit-site-templates__dataviews-list-pagination");
}
}
Comment on lines -35 to -39

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer needed, because the parent context .dataviews-footer now sets the z-index 2 (which was added a couple months after this .edit-site-page-templates override was added).


.edit-site-list__rename-modal {
// The rename dropdown popover is open at the same time as the rename modal. The latter has to be higher.
z-index: z-index(".edit-site-list__rename-modal");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use "@wordpress/base-styles/colors" as *;
@use "@wordpress/base-styles/mixins" as *;
@use "@wordpress/base-styles/variables" as *;
@use "@wordpress/base-styles/z-index" as *;

.edit-site-sidebar-navigation-screen {
display: flex;
Expand Down Expand Up @@ -39,7 +38,8 @@
padding-top: $grid-unit-60;
margin-bottom: $grid-unit-10;
padding-bottom: $grid-unit-10;
z-index: z-index(".edit-site-sidebar-navigation-screen__title-icon");
// Title needs to appear above other UI in the section content.
z-index: 1;
}

.edit-site-sidebar-navigation-screen__title {
Expand Down
Loading