From 2cdc41916fd770b340c57703c638513977c6f7d9 Mon Sep 17 00:00:00 2001
From: Kat Hagan <kat@codebykat.com>
Date: Tue, 1 Oct 2019 19:00:45 -0700
Subject: [PATCH 1/3] replace defined CSS colors with Color Studio as per
 design guidelines

---
 lib/auth/style.scss | 51 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/lib/auth/style.scss b/lib/auth/style.scss
index fdd41b9f2..7a44866d7 100644
--- a/lib/auth/style.scss
+++ b/lib/auth/style.scss
@@ -23,7 +23,7 @@
   }
 
   .login__auth-message.is-error {
-    color: #be2a31;
+    color: $studio-red-60;
     font-size: 16px;
     margin: 0 auto 16px;
     max-width: 347px;
@@ -37,8 +37,8 @@
 
   input,
   button[type='submit'] {
-    background-color: #ffffff;
-    border: solid 1px #e3e0e2;
+    background-color: $studio-white;
+    border: solid 1px $studio-gray-5;
     border-radius: 4px;
     box-sizing: border-box;
     display: block;
@@ -52,21 +52,21 @@
   }
 
   button[type='submit'] {
-    background-color: #3584c8;
+    background-color: $studio-blue-50;
     border: none;
-    color: #ffffff;
+    color: $studio-white;
     font-weight: 500;
     margin: 16px auto 8px;
     padding: 0px 15px 2px;
   }
 
   a.login__forgot {
-    color: #135d95;
+    color: $studio-gray-60;
     text-decoration: none;
   }
 
   .login__forgot, .login__signup, .terms {
-    color: #51565f;
+    color: $studio-gray-60;
     display: block;
     font-size: 14px;
     margin: 16px auto;
@@ -75,14 +75,14 @@
   }
 
   .login__signup a, .terms a {
-    color: #135d95;
+    color: $studio-blue-60;
     margin-left: 5px;
     text-decoration: none;
   }
 
   .or {
-    background: #ffffff;
-    color: #6f7780;
+    background: $studio-white;
+    color: $studio-gray-60;
     display: block;
     font-size: 15px;
     font-style: italic;
@@ -95,7 +95,7 @@
   }
 
   .or-line {
-    border-bottom: 1px solid #dbdee0;
+    border-bottom: 1px solid $studio-gray-5;
     margin: -20px auto;
     max-width: 320px;
     text-align: center;
@@ -105,10 +105,10 @@
   }
 
   .wpcc-button {
-    background-color: #006088;
+    background-color: $studio-blue-50;
     border-radius: 4px;
     box-sizing: border-box;
-    color: #ffffff;
+    color: $studio-white;
     display: block;
     font-size: 16px;
     font-weight: 500;
@@ -123,7 +123,30 @@
 }
 
 .theme-dark .login {
+  h1 {
+    color: $studio-white;
+  }
+  a.login__forgot {
+    color: $studio-gray-20;
+  }
+
+  .login__forgot, .login__signup, .terms {
+    color: $studio-gray-20;
+  }
+
+  .login__signup a, .terms a {
+    color: $studio-blue-20;
+  }
+
+  .login__auth-message.is-error {
+    color: $studio-red-20;
+  }
+
   .or {
-    background: #1e1e1e;
+    background: $studio-gray-90;
+    color: $studio-gray-20;
+  }
+  .or-line {
+    border-color: $studio-gray-80;
   }
 }

From 7b57bc6e1349ab0fcca3d464ae0c963c9b8e914f Mon Sep 17 00:00:00 2001
From: Kat Hagan <kat@codebykat.com>
Date: Tue, 1 Oct 2019 19:15:40 -0700
Subject: [PATCH 2/3] update release notes

---
 RELEASE-NOTES.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 188c879b8..80128cb0e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -5,7 +5,9 @@
 ### Enhancements
 
 - Open new note automatically upon creation [1582](https://github.com/Automattic/simplenote-electron/pull/1582)
-- Updated colors to use Color Studio, the color palette for Automattic products [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
+- Updated colors to use Color Studio, the color palette for Automattic products
+   - [#1565](https://github.com/Automattic/simplenote-electron/pull/1565)
+   - [#1612](https://github.com/Automattic/simplenote-electron/pull/1612)
 
 ### Fixes
 

From ee823f8410034d0771030ac93312b702824b7ca6 Mon Sep 17 00:00:00 2001
From: Kat Hagan <kat@codebykat.com>
Date: Thu, 3 Oct 2019 20:23:57 -0700
Subject: [PATCH 3/3] fix WPCC background blue, input and text grays for dark
 mode

---
 lib/auth/style.scss |  2 +-
 scss/theme.scss     | 27 +++++++--------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/lib/auth/style.scss b/lib/auth/style.scss
index 7a44866d7..7bce1ddd3 100644
--- a/lib/auth/style.scss
+++ b/lib/auth/style.scss
@@ -105,7 +105,7 @@
   }
 
   .wpcc-button {
-    background-color: $studio-blue-50;
+    background-color: $studio-wordpress-blue-50;
     border-radius: 4px;
     box-sizing: border-box;
     color: $studio-white;
diff --git a/scss/theme.scss b/scss/theme.scss
index d8256f868..6250e0480 100644
--- a/scss/theme.scss
+++ b/scss/theme.scss
@@ -42,23 +42,6 @@
     border-color: $studio-gray-80;
   }
 
-  .search-field {
-    border-color: $studio-gray-60;
-
-    ::-moz-placeholder { /* Firefox 19+ */
-      color: $studio-gray-30;
-    }
-    ::webkit-input-placeholder { /* IE 10+ */
-      color: $studio-gray-30;
-    }
-    :-ms-input-placeholder { /* IE 10+ */
-      color: $studio-gray-30;
-    }
-    :-moz-placeholder { /* Firefox 18- */
-      color: $studio-gray-30;
-    }
-  }
-
   ::-webkit-scrollbar-thumb {
     background-color: $studio-gray-80;
     border-color: $studio-gray-60;
@@ -79,14 +62,18 @@
     }
   }
 
+  input {
+    color: $studio-white;
+  }
+
   input,
   textarea {
     border-color: $studio-gray-70;
     background-color: transparent;
   }
 
-  .transparent-input::placeholder {
-    color: $studio-gray-80;
+  .transparent-input::placeholder, input::placeholder {
+    color: $studio-gray-20;
   }
 
   .checkbox-control-base {
@@ -129,7 +116,7 @@
     }
 
     .note-list-item-excerpt {
-      color: white;
+      color: $studio-gray-20;
     }
   }
   &.note-list-item-selected .note-list-item-excerpt .note-list-item-pinner {