Fix oauth code parsing, compsoer quoted text color in dark themes

CHANGELOG.md

@@ -12,6 +12,10 @@ Improvements:
 
 Fixes:
 
+* On linux, the system tray icon is smaller (22x22 with 18x18 content vs 32x32)
+
+* In dark themes, quoted text no longer appears a dark purple that is difficult to read.
+
 * Mailspring no longer becomes "blocked" when ingesting a large number of deletions in a mailbox and will no longer attempt to retrieve many, many new messages all at once.
 
 * When changing accounts in the composer the signature correctly updates to the new account's default. #570

app/internal_packages/composer/styles/composer.less

@@ -24,7 +24,7 @@
 
 .RichEditor-root blockquote {
   border-left: 2px solid #eee;
-  color: #500050;
+  color: mix(@text-color, purple, 50%);
   margin: 0;
   padding: 0 0 0 10px;
   -webkit-margin-after: initial !important;
@@ -56,7 +56,7 @@
     }
   }
   blockquote {
-    color: #500050;
+    color: mix(@text-color, purple, 50%);
   }
   &:hover {
     border: 1px dashed @border-color-divider;

app/internal_packages/onboarding/lib/oauth-signin-page.jsx

@@ -2,6 +2,7 @@ import { shell, clipboard } from 'electron';
 import { React, PropTypes } from 'mailspring-exports';
 import { RetinaImg } from 'mailspring-component-kit';
 import http from 'http';
+import url from 'url';
 
 import FormErrorMessage from './form-error-message';
 import { LOCAL_SERVER_PORT } from './onboarding-helpers';
@@ -49,12 +50,9 @@ export default class OAuthSignInPage extends React.Component {
     // launch a web server
     this._server = http.createServer((request, response) => {
       if (!this._mounted) return;
-      if (request.url.includes('code=')) {
-        let code = request.url.split('code=').pop();
-        if (code.endsWith('#')) {
-          code = code.substring(0, code.length - 1);
-        }
-        this._onReceivedCode(code);
+      const { query } = url.parse(request.url, { querystring: true });
+      if (query.code) {
+        this._onReceivedCode(query.code);
         response.writeHead(302, { Location: 'https://id.getmailspring.com/oauth/finished' });
         response.end();
       } else {