From 27dcee2f3403ed3a6b1a39e3422077cdb8c58dee Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Tue, 6 Feb 2018 10:54:13 -0800 Subject: [PATCH] Fix oauth code parsing, compsoer quoted text color in dark themes --- CHANGELOG.md | 4 ++++ .../composer/styles/composer.less | 4 ++-- .../onboarding/lib/oauth-signin-page.jsx | 10 ++++------ .../linux/MenuItem-Inbox-Full-NewItems.png | Bin 15214 -> 15672 bytes .../assets/linux/MenuItem-Inbox-Full.png | Bin 18701 -> 18697 bytes .../assets/linux/MenuItem-Inbox-Zero.png | Bin 18612 -> 18617 bytes 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f983576286..c6a8927038 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/app/internal_packages/composer/styles/composer.less b/app/internal_packages/composer/styles/composer.less index 5791cc0658..65d996eaed 100644 --- a/app/internal_packages/composer/styles/composer.less +++ b/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; diff --git a/app/internal_packages/onboarding/lib/oauth-signin-page.jsx b/app/internal_packages/onboarding/lib/oauth-signin-page.jsx index 303c2b1bfd..1c871ebc52 100644 --- a/app/internal_packages/onboarding/lib/oauth-signin-page.jsx +++ b/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 { diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Full-NewItems.png index 5164f46ff1adb85dbd381f724ac7ca2134e11cb7..feeeb2a8d118b219a15bc5e36d5601f7fd3bc4fe 100644 GIT binary patch delta 624 zcmaD?wxde1Gr-TCmrII^fq{Y7)59eQNQ;3m2OE$)vL(lQqM|sHb?8Q`MrIB}11lp7 zAewxb*$&Rx%*n#Xq+*zwoNQ*4Y^IxHnP{kMl46vsn`o4ps+($*Xl{{gkYbXQYO&dx zZ2{BdGb~(_qu8yPixbNx&tkVDO6TN1?6z1l1R=-%u7#AvD3HFFD`K{ zE3twKY~I3A$;f16G+Cd^oW;nn#SM*(apyp^T<9&Va z0pkf97an5dYi{4-)v#&Zakb-GYNEd1U1asygO44`y-~_MBVW~qFQ)y*7SD$21qq9k zRF(QVa7JAOv1ubrdhT{1iBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtX0y&wn zI)MWSFgZFgG&(ailfwf(2rxN1F*G_eHM0o>4g!v~>kBsm zF*vg%3~w(4vq5$Slb1U$e@{t7K~#9!tdl!S15pr#ziSd9VqqzY5CyRmf~HU`EPV8$ zh?RncwLd`6!qP^twG+gDU}cp~5etbZJ`g36LW#u929jgp?s{1g-9-lu+}9k=%$aK> z@gI>4?c=fA)j z`}xLdw!HEx5mj{qk3cG18Xn2MNBR>0igu5}icCz`f*fDbqUQn;)Yz&Tz^qL)3S3&V z5d{FZK+bn9A*mv1-EuH0HYL4C0!a%kY)&^x>}v6L#&33Q#irZSI%I*JpXsl=EvclZSr&VNVyw zkcwM(uG(@j849#LJkX`UQ6-fvees;1O@q2X_CaQjdk4646Zbc5<1%Y9`?tqTGyRdu z#Wdzdk;8}0Jw0R|{4Gpw}GuAM?b2!YT-{9+VJ31k)k>BC``qd7)49(Uv2&?S3iln9OLd`+de8ala;g&KDc^*?WBZ!^2Q?TxU)F TmH#!sP-pOT^>bP0l+XkKA(xY^ delta 423 zcmeC2#MnEDQL!_?&z+Y`ii?4Pf!EW+B?w3hfiMRfkPJK57rs&PJ1>WUrIn$vm5Iq@ z1wK0jCymcq#VFCz(!e4)N!KFPGELVc)znZoDK*hT*F4S0C^5}EHPyg8ar05W4=hBf zoGdG3I+;&|18&D=IT14!7DEdg{mJ$cqLXta6qpPxHup>9>$9le%(I%zuCiwP^82lcNli5F;*(^(X5Y*f!-k*kb$LhHI9@RI9IT6)_7?mQaL{+0{@Zreg8oK+uX+a4rS&akOg|QEW(sP1Hqq)nGlRQ9 W;DnsrzkdNkp25@A&t;ucLK6TvnUTT( diff --git a/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Zero.png b/app/internal_packages/system-tray/assets/linux/MenuItem-Inbox-Zero.png index ad5a52d7e50d25023ce361723afc2847e820ec5a..0c1da2d8a72c7d4313e942e7a46de7710c09a214 100644 GIT binary patch delta 424 zcmdlok#XllM#atmKX+a(DJ}*E23}7OmmnZ52ErU{K=R0z9P5pW-+4I<4XlhTtc;B( zEAZJNIB9&=Drp9WDHf>~DY}Wt76!T|=E=somMKYwx~6GHCaI>TmMMm2rkjuQePAI< zCG{9D`{NNqNe$k%5P%&=TDdAYlO{W(t;$B>F!cdpuU zF&PT9Jv`C1K_la(=bBs>YwM2;^BmT&@+(v@>u+h@+q8{q+N~d-Z)rrFIpW!LmMuu< zjLn<6+4Af=>V3kcEJ|iPU@I`%7s(dWxQcZiQpd)TcQ3;1tDBsA<&Z1Ufh z`yj1#|NLV9RbT(KXp0?T>QA{}ADQja`HYdL=7W&Nl(hRocbJNK&oyux^xnwiez4-8 za%%WfrYk{NzoSH~7yi&Y;Jd4SnKlU+^bDS^elF{r5}E+v@|8pY delta 419 zcmdlvk#WmJM#atmKX+a(DJ}*E23}7OmmnZ51i~C_Kr-xHU-(AF@4OramR5$QRz^mX z75MBBoHRab6$29kGedL3MBQWqLla#S6VqhfB;&*+T?_Nn6k|(6<79(0gUv_zKClp_ za0~|;4!9kg>Y^?%4W(ktP2@>$VNy7p}2-=l-cQV{1Csa`wdm5zl>< zDQfbb4Nv5M?i7?(TERL+G=Bn9_yWDgX9uhn&E++i>cGB0oKcD)nv>IMHjkR_S6ZxYUTb1}Clh}1+G+6ZxoO$pJE;1{$B{ R*#bkI!PC{xWt~$(697SCjxYcK