From 1f46408f4315fde4828043e8b83fa4cc9cef9af9 Mon Sep 17 00:00:00 2001
From: jasmussen <joen@automattic.com>
Date: Wed, 26 May 2021 16:16:35 +0200
Subject: [PATCH] Try: Fix notices below block toolbars.

---
 packages/base-styles/_z-index.scss                 |  4 ----
 .../src/components/editor-notices/style.scss       | 14 ++------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
index 30d87dbd0ed90..80794990713ff 100644
--- a/packages/base-styles/_z-index.scss
+++ b/packages/base-styles/_z-index.scss
@@ -114,10 +114,6 @@ $z-layers: (
 	// Show the FSE template previews above the editor and any open block toolbars
 	".edit-site-navigation-panel__preview": 32,
 
-	// Show notices below expanded editor bar
-	// .edit-post-header { z-index: 30 }
-	".components-notice-list": 29,
-
 	// Above the block list and the header.
 	".block-editor-block-list__block-popover": 31,
 
diff --git a/packages/editor/src/components/editor-notices/style.scss b/packages/editor/src/components/editor-notices/style.scss
index 8ce8fb9004e33..f3b1f76285874 100644
--- a/packages/editor/src/components/editor-notices/style.scss
+++ b/packages/editor/src/components/editor-notices/style.scss
@@ -1,22 +1,12 @@
-// Dismissible notices.
-.components-editor-notices__dismissible {
-	position: sticky;
-	top: 0;
-	right: 0;
-	color: $gray-900;
-}
-
-// Non-dismissible notices.
+// Dismissible & non-dismissible notices.
+.components-editor-notices__dismissible,
 .components-editor-notices__pinned {
 	position: relative;
 	left: 0;
 	top: 0;
 	right: 0;
 	color: $gray-900;
-}
 
-.components-editor-notices__dismissible,
-.components-editor-notices__pinned {
 	.components-notice {
 		box-sizing: border-box;
 		margin: 0;