Skip to content

Commit

Permalink
Branding: Changed the tray and top icons
Browse files Browse the repository at this point in the history
  • Loading branch information
SpecialAro authored and vraravam committed Apr 21, 2022
1 parent 6e126a8 commit c011b9d
Show file tree
Hide file tree
Showing 20 changed files with 125 additions and 40 deletions.
111 changes: 111 additions & 0 deletions src/assets/images/ferdium-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions src/assets/images/logo-beard-only.svg

This file was deleted.

15 changes: 0 additions & 15 deletions src/assets/images/logo.svg

This file was deleted.

1 change: 1 addition & 0 deletions src/assets/images/moustache.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/tray/win32/tray-indirect.ico
Binary file not shown.
Binary file modified src/assets/images/tray/win32/tray-unread.ico
Binary file not shown.
Binary file modified src/assets/images/tray/win32/tray.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/auth/AuthLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class AuthLayout extends Component {
{isWindows && !isFullScreen && (
<TitleBar
menu={window['ferdium'].menu.template}
icon="assets/images/logo.svg"
icon="assets/images/ferdium-icon.svg"
/>
)}
<div className="auth">
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/ChangeServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class ChangeServer extends Component {
return (
<div className="auth__container">
<form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
<Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
<Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link>
<h1>{intl.formatMessage(messages.headline)}</h1>
{form.$('server').value === this.franzServer && (
<Infobox type="warning">
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Import.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Import extends Component {
className="franz-form auth__form"
onSubmit={e => this.submit(e)}
>
<img src="./assets/images/logo.svg" className="auth__logo" alt="" />
<img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" />
<h1>{intl.formatMessage(messages.headline)}</h1>
<table className="service-table available-services">
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Invite.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class Invite extends Component {

<form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
{!embed && (
<img src="./assets/images/logo.svg" className="auth__logo" alt="" />
<img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" />
)}
<h1 className={embed && 'invite__embed'}>
{intl.formatMessage(messages.headline)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Locked.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class Locked extends Component {
return (
<div className="auth__container">
<form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
<img src="./assets/images/logo.svg" className="auth__logo" alt="" />
<img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" />
<h1>{intl.formatMessage(messages.headline)}</h1>

{touchIdEnabled && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Login extends Component {
return (
<div className="auth__container">
<form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
<Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
<Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link>
<h1>{intl.formatMessage(messages.headline)}</h1>
{isTokenExpired && (
<p className="error-message center">
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Password.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class Password extends Component {
return (
<div className="auth__container">
<form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
<Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
<Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link>
<h1>{intl.formatMessage(messages.headline)}</h1>
{status.length > 0 && status.includes('sent') && (
<Infobox type="success" icon="checkbox-marked-circle-outline">
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/SetupAssistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class SetupAssistant extends Component {
</Appear>
)}

<img src="./assets/images/logo.svg" className="auth__logo" alt="" />
<img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" />
<h1>{intl.formatMessage(messages.headline)}</h1>
<h2>{intl.formatMessage(messages.subHeadline)}</h2>
<div className={classnames('grid', classes.servicesGrid)}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class Signup extends Component {
className="franz-form auth__form"
onSubmit={e => this.submit(e)}
>
<Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link>
<Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link>
<h1>{intl.formatMessage(messages.headline)}</h1>
<div className="grid__row">
<Input field={form.$('firstname')} focus />
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/Welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Welcome extends Component {
<div className="welcome">
<div className="welcome__content">
<img
src="./assets/images/logo.svg"
src="./assets/images/ferdium-icon.svg"
className="welcome__logo"
alt=""
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/AppLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class AppLayout extends Component {
{isWindows && !isFullScreen && (
<TitleBar
menu={window['ferdium'].menu.template}
icon="assets/images/logo.svg"
icon="assets/images/ferdium-icon.svg"
/>
)}
{isMac && !isFullScreen && (
Expand Down
2 changes: 1 addition & 1 deletion src/components/services/content/Services.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class Services extends Component {
<Appear timeout={1500} transitionName="slideUp">
<div className="services__no-service">
<img
src="./assets/images/logo-beard-only.svg"
src="./assets/images/moustache.svg"
alt="Logo"
style={{ maxHeight: '50vh' }}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/settings/account/AccountDashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class AccountDashboard extends Component {
<div className="account">
<div className="account__box account__box--flex">
<div className="account__avatar">
<img src="./assets/images/logo.svg" alt="" />
<img src="./assets/images/ferdium-icon.svg" alt="" />
</div>
<div className="account__info">
<H1>
Expand Down

0 comments on commit c011b9d

Please sign in to comment.