From 36b58b9c6f8140bab6d6ad4b45d197535c01adf0 Mon Sep 17 00:00:00 2001
From: Joen Asmussen <asmussen@gmail.com>
Date: Thu, 20 Feb 2020 09:48:29 +0100
Subject: [PATCH] Address feedback.

- Restore gray sidebar header.
- Use isPrimary for toolbar library button.
- Make inbetweenserter not look primary.
---
 .../src/components/block-list/style.scss         | 16 ++++++++--------
 .../src/components/inserter/index.js             |  1 +
 .../src/components/inserter/style.scss           | 15 ---------------
 .../edit-post/src/components/header/style.scss   | 10 ----------
 .../components/sidebar/sidebar-header/style.scss |  1 +
 5 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/style.scss b/packages/block-editor/src/components/block-list/style.scss
index 4869189f876dd..7089dc001fe7e 100644
--- a/packages/block-editor/src/components/block-list/style.scss
+++ b/packages/block-editor/src/components/block-list/style.scss
@@ -372,14 +372,14 @@
 		min-width: 32px;
 		height: 32px;
 
-		// Spot color button.
-		background-color: $blue-medium-focus;
-		color: $white;
-		border-radius: $radius-block-ui;
-
-		&:hover {
-			color: $white;
-			background-color: rgba($blue-medium-focus, 0.8);
+		// Although this is a primary button, don't show it as such when in between blocks.
+		// @todo, this could use a separate iteration.
+		background: transparent;
+		color: $theme-color;
+
+		&:hover:not(:disabled) {
+			background: transparent;
+			color: $theme-color;
 		}
 	}
 }
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
index 11f07899494b4..7e7026ec18b63 100644
--- a/packages/block-editor/src/components/inserter/index.js
+++ b/packages/block-editor/src/components/inserter/index.js
@@ -38,6 +38,7 @@ const defaultRenderToggle = ( {
 	}
 	return (
 		<Button
+			isPrimary
 			icon={ plusCircle }
 			label={ label }
 			tooltipPosition="bottom"
diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 09fb655e34de7..980d977e11d36 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -34,21 +34,6 @@ $block-inserter-search-height: 38px;
 	padding: 0;
 	transition: color 0.2s ease;
 	@include reduce-motion("transition");
-
-	&:hover:not(:disabled) {
-		background: color($theme-color shade(10%));
-		color: $white;
-	}
-
-	&:active:not(:disabled) {
-		background: color($theme-color shade(20%));
-		border-color: color($theme-color shade(20%));
-		color: $white;
-	}
-
-	&:focus:not(:disabled) {
-		box-shadow: inset 0 0 0 1px $white, 0 0 0 2px color($theme-color);
-	}
 }
 
 .block-editor-inserter__menu {
diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
index 3a35519d116b7..b31a943b68eaa 100644
--- a/packages/edit-post/src/components/header/style.scss
+++ b/packages/edit-post/src/components/header/style.scss
@@ -61,16 +61,6 @@
 		// Special dimensions for this button.
 		min-width: 32px;
 		height: 32px;
-
-		// Spot color button.
-		background-color: $blue-medium-focus;
-		color: $white;
-		border-radius: $radius-block-ui;
-
-		&:hover {
-			color: $white;
-			background-color: rgba($blue-medium-focus, 0.8);
-		}
 	}
 }
 
diff --git a/packages/edit-post/src/components/sidebar/sidebar-header/style.scss b/packages/edit-post/src/components/sidebar/sidebar-header/style.scss
index 0baad3952d836..aac3b2630f9a7 100644
--- a/packages/edit-post/src/components/sidebar/sidebar-header/style.scss
+++ b/packages/edit-post/src/components/sidebar/sidebar-header/style.scss
@@ -17,6 +17,7 @@
 
 .components-panel__header.edit-post-sidebar-header {
 	padding-right: $grid-unit-05;
+	background: $light-gray-200;
 
 	.components-button.has-icon {
 		display: none;