Merge 1.18.0 (#2153)

Automattic · Jun 16, 2020 · d710b3a · d710b3a
2 parents 5d6319e + 3bcf11a
commit d710b3a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,11 +1,24 @@
 # Changelog
 
+## [v1.18.0]
+
+### Enhancements
+
+- Updated Blue to Simplenote Blue [#2043](https://github.com/Automattic/simplenote-electron/pull/2043)
+- Simplify login form validation [#2095](https://github.com/Automattic/simplenote-electron/pull/2095)
+
+### Other Changes
+
+- Added types to react-tabs module [#2096](https://github.com/Automattic/simplenote-electron/pull/2096)
+- Added UNSAFE to deprecated React methods [#2123](https://github.com/Automattic/simplenote-electron/pull/2123)
+- Updated Publisher display name for Windows Store [#2131](https://github.com/Automattic/simplenote-electron/pull/2131)
+
 ## [v1.17.0]
 
 ### Enhancements
 
 - Added option to disable keyboard shortcuts [#2075](https://github.com/Automattic/simplenote-electron/pull/2075)
-- Added a password validation utility [#2086](https://github.com/Automattic/simplenote-electron/pull/2086) and stricter password requirements on signup [#2087](https://github.com/Automattic/simplenote-electron/pull/2087) and login [#2088](https://github.com/Automattic/simplenote-electron/pull/2088)
+- Added a password validation utility [#2086](https://github.com/Automattic/simplenote-electron/pull/2086), [#2114](https://github.com/Automattic/simplenote-electron/pull/2114) and stricter password requirements on signup [#2087](https://github.com/Automattic/simplenote-electron/pull/2087) and login [#2088](https://github.com/Automattic/simplenote-electron/pull/2088)
 
 ### Fixes
 

diff --git a/lib/auth/index.tsx b/lib/auth/index.tsx
@@ -257,7 +257,7 @@ export class Auth extends Component<Props> {
     }
 
     const passwordError =
-      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not include your email address.';
+      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not match your email address.';
 
     if (this.state.isCreatingAccount) {
       const username = get(this.usernameInput, 'value');
@@ -305,7 +305,7 @@ export class Auth extends Component<Props> {
     const username = get(this.usernameInput, 'value');
     const password = get(this.passwordInput, 'value');
     const passwordError =
-      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not include your email address.';
+      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not match your email address.';
 
     // signup - stricter password requirements apply
     if (this.state.isCreatingAccount) {

diff --git a/lib/auth/style.scss b/lib/auth/style.scss
@@ -88,7 +88,7 @@
 
   .login__signup a,
   .terms a {
-    color: $studio-simplenote-blue-60;
+    color: $studio-simplenote-blue-50;
     margin-left: 5px;
     text-decoration: none;
   }
@@ -151,7 +151,7 @@
 
   .login__signup a,
   .terms a {
-    color: $studio-simplenote-blue-20;
+    color: $studio-simplenote-blue-30;
   }
 
   .login__auth-message.is-error {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "email": "[email protected]"
   },
   "productName": "Simplenote",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "main": "desktop/index.js",
   "license": "GPL-2.0",
   "homepage": "https://simplenote.com",

diff --git a/scss/theme.scss b/scss/theme.scss
@@ -101,7 +101,7 @@
     button {
       color: $studio-simplenote-blue-30;
     }
-    svg {
+    svg[class^='icon-'] {
       fill: $studio-simplenote-blue-30;
     }
   }