From 8e3949173e22b64f101babdab3c06b8378750233 Mon Sep 17 00:00:00 2001 From: Fernando Figueiredo Date: Fri, 22 Apr 2022 20:38:22 -0300 Subject: Complete tray icons redesign for all platforms (#28) --- src/assets/images/adlk.svg | 33 +++--- src/assets/images/appearance/ribbon_large.png | Bin 6949 -> 15293 bytes src/assets/images/appearance/ribbon_medium.png | Bin 7051 -> 15638 bytes src/assets/images/appearance/ribbon_small.png | Bin 4353 -> 14045 bytes src/assets/images/ferdium-icon.svg | 111 --------------------- src/assets/images/logo-beard-only.svg | 4 + src/assets/images/logo.svg | 4 + src/assets/images/moustache.svg | 1 - src/assets/images/tray/darwin-dark/tray-active.png | Bin 349 -> 304 bytes .../images/tray/darwin-dark/tray-active@2x.png | Bin 1041 -> 564 bytes .../tray/darwin-dark/tray-indirect-active.png | Bin 472 -> 515 bytes .../tray/darwin-dark/tray-indirect-active@2x.png | Bin 1363 -> 1183 bytes .../images/tray/darwin-dark/tray-indirect.png | Bin 472 -> 515 bytes .../images/tray/darwin-dark/tray-indirect@2x.png | Bin 1363 -> 1183 bytes .../images/tray/darwin-dark/tray-unread-active.png | Bin 392 -> 488 bytes .../tray/darwin-dark/tray-unread-active@2x.png | Bin 1147 -> 1084 bytes src/assets/images/tray/darwin-dark/tray-unread.png | Bin 392 -> 488 bytes .../images/tray/darwin-dark/tray-unread@2x.png | Bin 1147 -> 1084 bytes src/assets/images/tray/darwin-dark/tray.png | Bin 349 -> 304 bytes src/assets/images/tray/darwin-dark/tray@2x.png | Bin 1041 -> 564 bytes src/assets/images/tray/darwin/tray-active.png | Bin 349 -> 304 bytes src/assets/images/tray/darwin/tray-active@2x.png | Bin 1041 -> 564 bytes .../images/tray/darwin/tray-indirect-active.png | Bin 472 -> 515 bytes .../images/tray/darwin/tray-indirect-active@2x.png | Bin 1363 -> 1183 bytes src/assets/images/tray/darwin/tray-indirect.png | Bin 447 -> 490 bytes src/assets/images/tray/darwin/tray-indirect@2x.png | Bin 1232 -> 1154 bytes .../images/tray/darwin/tray-unread-active.png | Bin 392 -> 488 bytes .../images/tray/darwin/tray-unread-active@2x.png | Bin 1147 -> 1084 bytes src/assets/images/tray/darwin/tray-unread.png | Bin 330 -> 449 bytes src/assets/images/tray/darwin/tray-unread@2x.png | Bin 970 -> 1029 bytes src/assets/images/tray/darwin/tray.png | Bin 294 -> 307 bytes src/assets/images/tray/darwin/tray@2x.png | Bin 888 -> 626 bytes src/assets/images/tray/linux/tray-indirect.png | Bin 1863 -> 2338 bytes src/assets/images/tray/linux/tray-indirect@2x.png | Bin 3554 -> 3905 bytes src/assets/images/tray/linux/tray-unread.png | Bin 1785 -> 2206 bytes src/assets/images/tray/linux/tray-unread@2x.png | Bin 3509 -> 3727 bytes src/assets/images/tray/linux/tray.png | Bin 1082 -> 1103 bytes src/assets/images/tray/linux/tray@2x.png | Bin 2244 -> 1862 bytes src/assets/images/tray/win32/tray-indirect.ico | Bin 16958 -> 28276 bytes src/assets/images/tray/win32/tray-unread.ico | Bin 16958 -> 27121 bytes src/assets/images/tray/win32/tray.ico | Bin 16958 -> 21900 bytes src/components/auth/AuthLayout.js | 2 +- src/components/auth/ChangeServer.js | 2 +- src/components/auth/Import.js | 2 +- src/components/auth/Invite.js | 2 +- src/components/auth/Locked.js | 2 +- src/components/auth/Login.js | 2 +- src/components/auth/Password.js | 2 +- src/components/auth/SetupAssistant.js | 2 +- src/components/auth/Signup.js | 2 +- src/components/auth/Welcome.js | 2 +- src/components/layout/AppLayout.js | 2 +- src/components/services/content/Services.js | 2 +- .../settings/account/AccountDashboard.js | 2 +- 54 files changed, 36 insertions(+), 143 deletions(-) delete mode 100644 src/assets/images/ferdium-icon.svg create mode 100644 src/assets/images/logo-beard-only.svg create mode 100644 src/assets/images/logo.svg delete mode 100644 src/assets/images/moustache.svg diff --git a/src/assets/images/adlk.svg b/src/assets/images/adlk.svg index fac6e1051..19be96f28 100644 --- a/src/assets/images/adlk.svg +++ b/src/assets/images/adlk.svg @@ -1,19 +1,16 @@ - - - - - - - - - - - - - - - + + + - - - + + + + + + + + + + + + diff --git a/src/assets/images/appearance/ribbon_large.png b/src/assets/images/appearance/ribbon_large.png index db327f7f5..84e9d0211 100644 Binary files a/src/assets/images/appearance/ribbon_large.png and b/src/assets/images/appearance/ribbon_large.png differ diff --git a/src/assets/images/appearance/ribbon_medium.png b/src/assets/images/appearance/ribbon_medium.png index 43a716a51..7e3fd4a83 100644 Binary files a/src/assets/images/appearance/ribbon_medium.png and b/src/assets/images/appearance/ribbon_medium.png differ diff --git a/src/assets/images/appearance/ribbon_small.png b/src/assets/images/appearance/ribbon_small.png index 2e346f11a..2af6c4933 100644 Binary files a/src/assets/images/appearance/ribbon_small.png and b/src/assets/images/appearance/ribbon_small.png differ diff --git a/src/assets/images/ferdium-icon.svg b/src/assets/images/ferdium-icon.svg deleted file mode 100644 index c44a8ddcd..000000000 --- a/src/assets/images/ferdium-icon.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/images/logo-beard-only.svg b/src/assets/images/logo-beard-only.svg new file mode 100644 index 000000000..c44ce1f11 --- /dev/null +++ b/src/assets/images/logo-beard-only.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg new file mode 100644 index 000000000..f49c3b529 --- /dev/null +++ b/src/assets/images/logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/moustache.svg b/src/assets/images/moustache.svg deleted file mode 100644 index 9fed27843..000000000 --- a/src/assets/images/moustache.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/images/tray/darwin-dark/tray-active.png b/src/assets/images/tray/darwin-dark/tray-active.png index 88eb13fed..a39b593d0 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-active.png and b/src/assets/images/tray/darwin-dark/tray-active.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-active@2x.png b/src/assets/images/tray/darwin-dark/tray-active@2x.png index 86e50165d..92e296a2a 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-active@2x.png and b/src/assets/images/tray/darwin-dark/tray-active@2x.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-indirect-active.png b/src/assets/images/tray/darwin-dark/tray-indirect-active.png index c9b7539bc..e1146672e 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-indirect-active.png and b/src/assets/images/tray/darwin-dark/tray-indirect-active.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png b/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png index 94f7b3cfc..241a5054a 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png and b/src/assets/images/tray/darwin-dark/tray-indirect-active@2x.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-indirect.png b/src/assets/images/tray/darwin-dark/tray-indirect.png index c9b7539bc..e0aadcde2 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-indirect.png and b/src/assets/images/tray/darwin-dark/tray-indirect.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-indirect@2x.png b/src/assets/images/tray/darwin-dark/tray-indirect@2x.png index 94f7b3cfc..241a5054a 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-indirect@2x.png and b/src/assets/images/tray/darwin-dark/tray-indirect@2x.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-unread-active.png b/src/assets/images/tray/darwin-dark/tray-unread-active.png index def5a7d97..41b351c99 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-unread-active.png and b/src/assets/images/tray/darwin-dark/tray-unread-active.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png b/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png index c44d166e5..491faeae2 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png and b/src/assets/images/tray/darwin-dark/tray-unread-active@2x.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-unread.png b/src/assets/images/tray/darwin-dark/tray-unread.png index def5a7d97..bc70c6c7a 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-unread.png and b/src/assets/images/tray/darwin-dark/tray-unread.png differ diff --git a/src/assets/images/tray/darwin-dark/tray-unread@2x.png b/src/assets/images/tray/darwin-dark/tray-unread@2x.png index c44d166e5..491faeae2 100644 Binary files a/src/assets/images/tray/darwin-dark/tray-unread@2x.png and b/src/assets/images/tray/darwin-dark/tray-unread@2x.png differ diff --git a/src/assets/images/tray/darwin-dark/tray.png b/src/assets/images/tray/darwin-dark/tray.png index 88eb13fed..eedc60b7e 100644 Binary files a/src/assets/images/tray/darwin-dark/tray.png and b/src/assets/images/tray/darwin-dark/tray.png differ diff --git a/src/assets/images/tray/darwin-dark/tray@2x.png b/src/assets/images/tray/darwin-dark/tray@2x.png index 86e50165d..92e296a2a 100644 Binary files a/src/assets/images/tray/darwin-dark/tray@2x.png and b/src/assets/images/tray/darwin-dark/tray@2x.png differ diff --git a/src/assets/images/tray/darwin/tray-active.png b/src/assets/images/tray/darwin/tray-active.png index 88eb13fed..1a8f2c977 100644 Binary files a/src/assets/images/tray/darwin/tray-active.png and b/src/assets/images/tray/darwin/tray-active.png differ diff --git a/src/assets/images/tray/darwin/tray-active@2x.png b/src/assets/images/tray/darwin/tray-active@2x.png index 86e50165d..92e296a2a 100644 Binary files a/src/assets/images/tray/darwin/tray-active@2x.png and b/src/assets/images/tray/darwin/tray-active@2x.png differ diff --git a/src/assets/images/tray/darwin/tray-indirect-active.png b/src/assets/images/tray/darwin/tray-indirect-active.png index c9b7539bc..e0a96a6a9 100644 Binary files a/src/assets/images/tray/darwin/tray-indirect-active.png and b/src/assets/images/tray/darwin/tray-indirect-active.png differ diff --git a/src/assets/images/tray/darwin/tray-indirect-active@2x.png b/src/assets/images/tray/darwin/tray-indirect-active@2x.png index 94f7b3cfc..241a5054a 100644 Binary files a/src/assets/images/tray/darwin/tray-indirect-active@2x.png and b/src/assets/images/tray/darwin/tray-indirect-active@2x.png differ diff --git a/src/assets/images/tray/darwin/tray-indirect.png b/src/assets/images/tray/darwin/tray-indirect.png index fc27da650..4a664fcc6 100644 Binary files a/src/assets/images/tray/darwin/tray-indirect.png and b/src/assets/images/tray/darwin/tray-indirect.png differ diff --git a/src/assets/images/tray/darwin/tray-indirect@2x.png b/src/assets/images/tray/darwin/tray-indirect@2x.png index 674a6d78b..664badad3 100644 Binary files a/src/assets/images/tray/darwin/tray-indirect@2x.png and b/src/assets/images/tray/darwin/tray-indirect@2x.png differ diff --git a/src/assets/images/tray/darwin/tray-unread-active.png b/src/assets/images/tray/darwin/tray-unread-active.png index def5a7d97..5fa2d035e 100644 Binary files a/src/assets/images/tray/darwin/tray-unread-active.png and b/src/assets/images/tray/darwin/tray-unread-active.png differ diff --git a/src/assets/images/tray/darwin/tray-unread-active@2x.png b/src/assets/images/tray/darwin/tray-unread-active@2x.png index c44d166e5..491faeae2 100644 Binary files a/src/assets/images/tray/darwin/tray-unread-active@2x.png and b/src/assets/images/tray/darwin/tray-unread-active@2x.png differ diff --git a/src/assets/images/tray/darwin/tray-unread.png b/src/assets/images/tray/darwin/tray-unread.png index 937f4c578..aa379ad18 100644 Binary files a/src/assets/images/tray/darwin/tray-unread.png and b/src/assets/images/tray/darwin/tray-unread.png differ diff --git a/src/assets/images/tray/darwin/tray-unread@2x.png b/src/assets/images/tray/darwin/tray-unread@2x.png index f07f3f108..725c62839 100644 Binary files a/src/assets/images/tray/darwin/tray-unread@2x.png and b/src/assets/images/tray/darwin/tray-unread@2x.png differ diff --git a/src/assets/images/tray/darwin/tray.png b/src/assets/images/tray/darwin/tray.png index 323e60cdb..b1b70ae87 100644 Binary files a/src/assets/images/tray/darwin/tray.png and b/src/assets/images/tray/darwin/tray.png differ diff --git a/src/assets/images/tray/darwin/tray@2x.png b/src/assets/images/tray/darwin/tray@2x.png index 91d2a0c2f..d277bbefa 100644 Binary files a/src/assets/images/tray/darwin/tray@2x.png and b/src/assets/images/tray/darwin/tray@2x.png differ diff --git a/src/assets/images/tray/linux/tray-indirect.png b/src/assets/images/tray/linux/tray-indirect.png index 423fabde3..ee469d78b 100644 Binary files a/src/assets/images/tray/linux/tray-indirect.png and b/src/assets/images/tray/linux/tray-indirect.png differ diff --git a/src/assets/images/tray/linux/tray-indirect@2x.png b/src/assets/images/tray/linux/tray-indirect@2x.png index 67f305ca5..4c9d01a1b 100644 Binary files a/src/assets/images/tray/linux/tray-indirect@2x.png and b/src/assets/images/tray/linux/tray-indirect@2x.png differ diff --git a/src/assets/images/tray/linux/tray-unread.png b/src/assets/images/tray/linux/tray-unread.png index 503188756..767381b48 100644 Binary files a/src/assets/images/tray/linux/tray-unread.png and b/src/assets/images/tray/linux/tray-unread.png differ diff --git a/src/assets/images/tray/linux/tray-unread@2x.png b/src/assets/images/tray/linux/tray-unread@2x.png index 1a0da8808..7e5866fab 100644 Binary files a/src/assets/images/tray/linux/tray-unread@2x.png and b/src/assets/images/tray/linux/tray-unread@2x.png differ diff --git a/src/assets/images/tray/linux/tray.png b/src/assets/images/tray/linux/tray.png index f9c7b9ee7..475fbd42b 100644 Binary files a/src/assets/images/tray/linux/tray.png and b/src/assets/images/tray/linux/tray.png differ diff --git a/src/assets/images/tray/linux/tray@2x.png b/src/assets/images/tray/linux/tray@2x.png index ce402ee76..164a2a414 100644 Binary files a/src/assets/images/tray/linux/tray@2x.png and b/src/assets/images/tray/linux/tray@2x.png differ diff --git a/src/assets/images/tray/win32/tray-indirect.ico b/src/assets/images/tray/win32/tray-indirect.ico index bece9c556..d4fad9559 100644 Binary files a/src/assets/images/tray/win32/tray-indirect.ico and b/src/assets/images/tray/win32/tray-indirect.ico differ diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index a2c04a124..2516f1dce 100644 Binary files a/src/assets/images/tray/win32/tray-unread.ico and b/src/assets/images/tray/win32/tray-unread.ico differ diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index aee9c17a3..cf8fd49cc 100644 Binary files a/src/assets/images/tray/win32/tray.ico and b/src/assets/images/tray/win32/tray.ico differ diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 2d13d0bf8..21c874c0f 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -58,7 +58,7 @@ class AuthLayout extends Component { {isWindows && !isFullScreen && ( )}
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 4f6bf3bb6..682f6512c 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js @@ -106,7 +106,7 @@ class ChangeServer extends Component { return (
this.submit(e)}> - +

{intl.formatMessage(messages.headline)}

{form.$('server').value === this.franzServer && ( diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 4f3d44049..281ceda97 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js @@ -89,7 +89,7 @@ class Import extends Component { className="franz-form auth__form" onSubmit={e => this.submit(e)} > - +

{intl.formatMessage(messages.headline)}

diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index aee8b1362..a23af7c6b 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -144,7 +144,7 @@ class Invite extends Component { this.submit(e)}> {!embed && ( - + )}

{intl.formatMessage(messages.headline)} diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 11ce1272a..ac1bc4e8c 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -99,7 +99,7 @@ class Locked extends Component { return (
this.submit(e)}> - +

{intl.formatMessage(messages.headline)}

{touchIdEnabled && ( diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 7f2cc91a7..3c9c07f0d 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -116,7 +116,7 @@ class Login extends Component { return (
this.submit(e)}> - +

{intl.formatMessage(messages.headline)}

{isTokenExpired && (

diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 143c1d158..49930f6bd 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -78,7 +78,7 @@ class Password extends Component { return (

this.submit(e)}> - +

{intl.formatMessage(messages.headline)}

{status.length > 0 && status.includes('sent') && ( diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 2109bd8de..a24f4e4d5 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js @@ -212,7 +212,7 @@ class SetupAssistant extends Component { )} - +

{intl.formatMessage(messages.headline)}

{intl.formatMessage(messages.subHeadline)}

diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 2d45cfa24..3cccb2428 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -123,7 +123,7 @@ class Signup extends Component { className="franz-form auth__form" onSubmit={e => this.submit(e)} > - +

{intl.formatMessage(messages.headline)}

diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index bc489065e..94ea4d603 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -50,7 +50,7 @@ class Welcome extends Component {
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 168886227..5aaac133a 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -135,7 +135,7 @@ class AppLayout extends Component { {isWindows && !isFullScreen && ( )} {isMac && !isFullScreen && ( diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index cdf189758..b38b0e3c3 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -112,7 +112,7 @@ class Services extends Component {
Logo diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 280963a1f..b500b82cf 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -145,7 +145,7 @@ class AccountDashboard extends Component {
- +

-- cgit v1.2.3-70-g09d2