From 70da204eb1e8b2083e9a92af05ca895c2defa5dd Mon Sep 17 00:00:00 2001
From: Jack Paine <chat@jckpn.me>
Date: Sat, 25 Jan 2020 00:05:27 +0000
Subject: [PATCH] Reduce contrast of rich text toolbar. Fix #4997 (#5740)

---
 CHANGELOG.txt                                |  1 +
 client/src/components/Draftail/Draftail.scss | 12 ++++++++----
 docs/releases/2.9.rst                        |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9216f9b39..a7b206ded 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 2.9 (xx.xx.xxxx) - IN DEVELOPMENT
 ~~~~~~~~~~~~~~~~
 
+ * Reduced contrast of rich text toolbar (Jack Paine)
  * Fix: Added ARIA alert role to live search forms in the admin (Casper Timmers)
  * Fix: Reorder login form elements to match expected tab order (Kjartan Sverrisson)
  * Fix: Re-add 'Close Explorer' button on mobile viewports (Sævar Öfjörð Magnússon)
diff --git a/client/src/components/Draftail/Draftail.scss b/client/src/components/Draftail/Draftail.scss
index 1395c4f39..7026e45c3 100644
--- a/client/src/components/Draftail/Draftail.scss
+++ b/client/src/components/Draftail/Draftail.scss
@@ -1,10 +1,10 @@
 $editor-z-index: $draftail-editor-z-index;
 
 $draftail-editor-text: $color-text-input;
-$draftail-editor-chrome: $color-grey-1;
-$draftail-editor-chrome-text: $color-white;
-$draftail-editor-chrome-active: $color-white;
-$draftail-editor-chrome-accent: lighten($draftail-editor-chrome, 20%);
+$draftail-editor-chrome: $color-white;
+$draftail-editor-chrome-text: $color-grey-2;
+$draftail-editor-chrome-active: $color-grey-2;
+$draftail-editor-chrome-accent: transparent;
 
 $draftail-editor-border: 0;
 $draftail-editor-padding: 0;
@@ -99,6 +99,10 @@ $draftail-editor-font-family: $font-serif;
     @include nice-margin;
 }
 
+.Draftail-Toolbar {
+    border: 1px solid $color-grey-3;
+}
+
 .title .Draftail-Editor .public-DraftEditor-content,
 .title .Draftail-Editor .public-DraftEditorPlaceholder-root {
     font-size: 2em;
diff --git a/docs/releases/2.9.rst b/docs/releases/2.9.rst
index e9845aab8..602b44799 100644
--- a/docs/releases/2.9.rst
+++ b/docs/releases/2.9.rst
@@ -14,7 +14,7 @@ What's new
 Other features
 ~~~~~~~~~~~~~~
 
- * ...
+ * Reduced contrast of rich text toolbar (Jack Paine)
 
 
 Bug fixes