From c011b9df5ffbfe885737e5838c497277d232a350 Mon Sep 17 00:00:00 2001 From: André Oliveira Date: Thu, 21 Apr 2022 12:12:40 +0100 Subject: Branding: Changed the tray and top icons --- src/assets/images/ferdium-icon.svg | 111 +++++++++++++++++++++ src/assets/images/logo-beard-only.svg | 12 --- src/assets/images/logo.svg | 15 --- src/assets/images/moustache.svg | 1 + src/assets/images/tray/win32/tray-indirect.ico | Bin 41109 -> 16958 bytes src/assets/images/tray/win32/tray-unread.ico | Bin 41805 -> 16958 bytes src/assets/images/tray/win32/tray.ico | Bin 38281 -> 16958 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 +- 20 files changed, 125 insertions(+), 40 deletions(-) create mode 100644 src/assets/images/ferdium-icon.svg delete mode 100644 src/assets/images/logo-beard-only.svg delete mode 100644 src/assets/images/logo.svg create mode 100644 src/assets/images/moustache.svg (limited to 'src') diff --git a/src/assets/images/ferdium-icon.svg b/src/assets/images/ferdium-icon.svg new file mode 100644 index 000000000..c44a8ddcd --- /dev/null +++ b/src/assets/images/ferdium-icon.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/logo-beard-only.svg b/src/assets/images/logo-beard-only.svg deleted file mode 100644 index bb6e47939..000000000 --- a/src/assets/images/logo-beard-only.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg deleted file mode 100644 index 93c66c97a..000000000 --- a/src/assets/images/logo.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/assets/images/moustache.svg b/src/assets/images/moustache.svg new file mode 100644 index 000000000..9fed27843 --- /dev/null +++ b/src/assets/images/moustache.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/tray/win32/tray-indirect.ico b/src/assets/images/tray/win32/tray-indirect.ico index bc48a4eef..bece9c556 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 34d21f185..a2c04a124 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 e3b7edf60..aee9c17a3 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 21c874c0f..2d13d0bf8 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 682f6512c..4f6bf3bb6 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 281ceda97..4f3d44049 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 a23af7c6b..aee8b1362 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 ac1bc4e8c..11ce1272a 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 3c9c07f0d..7f2cc91a7 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 49930f6bd..143c1d158 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 a24f4e4d5..2109bd8de 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 3cccb2428..2d45cfa24 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 94ea4d603..bc489065e 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 5aaac133a..168886227 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 b38b0e3c3..cdf189758 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 b500b82cf..280963a1f 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