diff options
author | Fernando Figueiredo <fernando.fig@gmail.com> | 2022-04-22 20:38:22 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-22 23:38:22 +0000 |
commit | 8e3949173e22b64f101babdab3c06b8378750233 (patch) | |
tree | d17cf402791586b5832feffbac58b27f4602acdd /src/components | |
parent | Turn off usage of 'debug' npm package using with electron-16 (fixes #17) (diff) | |
download | ferdium-app-8e3949173e22b64f101babdab3c06b8378750233.tar.gz ferdium-app-8e3949173e22b64f101babdab3c06b8378750233.tar.zst ferdium-app-8e3949173e22b64f101babdab3c06b8378750233.zip |
Complete tray icons redesign for all platforms (#28)
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/AuthLayout.js | 2 | ||||
-rw-r--r-- | src/components/auth/ChangeServer.js | 2 | ||||
-rw-r--r-- | src/components/auth/Import.js | 2 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 2 | ||||
-rw-r--r-- | src/components/auth/Locked.js | 2 | ||||
-rw-r--r-- | src/components/auth/Login.js | 2 | ||||
-rw-r--r-- | src/components/auth/Password.js | 2 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 2 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 2 | ||||
-rw-r--r-- | src/components/auth/Welcome.js | 2 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 2 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 2 |
13 files changed, 13 insertions, 13 deletions
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 { | |||
58 | {isWindows && !isFullScreen && ( | 58 | {isWindows && !isFullScreen && ( |
59 | <TitleBar | 59 | <TitleBar |
60 | menu={window['ferdium'].menu.template} | 60 | menu={window['ferdium'].menu.template} |
61 | icon="assets/images/ferdium-icon.svg" | 61 | icon="assets/images/logo.svg" |
62 | /> | 62 | /> |
63 | )} | 63 | )} |
64 | <div className="auth"> | 64 | <div className="auth"> |
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 { | |||
106 | return ( | 106 | return ( |
107 | <div className="auth__container"> | 107 | <div className="auth__container"> |
108 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 108 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
109 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> | 109 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
110 | <h1>{intl.formatMessage(messages.headline)}</h1> | 110 | <h1>{intl.formatMessage(messages.headline)}</h1> |
111 | {form.$('server').value === this.franzServer && ( | 111 | {form.$('server').value === this.franzServer && ( |
112 | <Infobox type="warning"> | 112 | <Infobox type="warning"> |
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 { | |||
89 | className="franz-form auth__form" | 89 | className="franz-form auth__form" |
90 | onSubmit={e => this.submit(e)} | 90 | onSubmit={e => this.submit(e)} |
91 | > | 91 | > |
92 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> | 92 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
93 | <h1>{intl.formatMessage(messages.headline)}</h1> | 93 | <h1>{intl.formatMessage(messages.headline)}</h1> |
94 | <table className="service-table available-services"> | 94 | <table className="service-table available-services"> |
95 | <tbody> | 95 | <tbody> |
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 { | |||
144 | 144 | ||
145 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 145 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
146 | {!embed && ( | 146 | {!embed && ( |
147 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> | 147 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
148 | )} | 148 | )} |
149 | <h1 className={embed && 'invite__embed'}> | 149 | <h1 className={embed && 'invite__embed'}> |
150 | {intl.formatMessage(messages.headline)} | 150 | {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 { | |||
99 | return ( | 99 | return ( |
100 | <div className="auth__container"> | 100 | <div className="auth__container"> |
101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
102 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> | 102 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
103 | <h1>{intl.formatMessage(messages.headline)}</h1> | 103 | <h1>{intl.formatMessage(messages.headline)}</h1> |
104 | 104 | ||
105 | {touchIdEnabled && ( | 105 | {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 { | |||
116 | return ( | 116 | return ( |
117 | <div className="auth__container"> | 117 | <div className="auth__container"> |
118 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 118 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
119 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> | 119 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
120 | <h1>{intl.formatMessage(messages.headline)}</h1> | 120 | <h1>{intl.formatMessage(messages.headline)}</h1> |
121 | {isTokenExpired && ( | 121 | {isTokenExpired && ( |
122 | <p className="error-message center"> | 122 | <p className="error-message center"> |
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 { | |||
78 | return ( | 78 | return ( |
79 | <div className="auth__container"> | 79 | <div className="auth__container"> |
80 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 80 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
81 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> | 81 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
82 | <h1>{intl.formatMessage(messages.headline)}</h1> | 82 | <h1>{intl.formatMessage(messages.headline)}</h1> |
83 | {status.length > 0 && status.includes('sent') && ( | 83 | {status.length > 0 && status.includes('sent') && ( |
84 | <Infobox type="success" icon="checkbox-marked-circle-outline"> | 84 | <Infobox type="success" icon="checkbox-marked-circle-outline"> |
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 { | |||
212 | </Appear> | 212 | </Appear> |
213 | )} | 213 | )} |
214 | 214 | ||
215 | <img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /> | 215 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
216 | <h1>{intl.formatMessage(messages.headline)}</h1> | 216 | <h1>{intl.formatMessage(messages.headline)}</h1> |
217 | <h2>{intl.formatMessage(messages.subHeadline)}</h2> | 217 | <h2>{intl.formatMessage(messages.subHeadline)}</h2> |
218 | <div className={classnames('grid', classes.servicesGrid)}> | 218 | <div className={classnames('grid', classes.servicesGrid)}> |
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 { | |||
123 | className="franz-form auth__form" | 123 | className="franz-form auth__form" |
124 | onSubmit={e => this.submit(e)} | 124 | onSubmit={e => this.submit(e)} |
125 | > | 125 | > |
126 | <Link to='/auth/welcome'><img src="./assets/images/ferdium-icon.svg" className="auth__logo" alt="" /></Link> | 126 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
127 | <h1>{intl.formatMessage(messages.headline)}</h1> | 127 | <h1>{intl.formatMessage(messages.headline)}</h1> |
128 | <div className="grid__row"> | 128 | <div className="grid__row"> |
129 | <Input field={form.$('firstname')} focus /> | 129 | <Input field={form.$('firstname')} focus /> |
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 { | |||
50 | <div className="welcome"> | 50 | <div className="welcome"> |
51 | <div className="welcome__content"> | 51 | <div className="welcome__content"> |
52 | <img | 52 | <img |
53 | src="./assets/images/ferdium-icon.svg" | 53 | src="./assets/images/logo.svg" |
54 | className="welcome__logo" | 54 | className="welcome__logo" |
55 | alt="" | 55 | alt="" |
56 | /> | 56 | /> |
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 { | |||
135 | {isWindows && !isFullScreen && ( | 135 | {isWindows && !isFullScreen && ( |
136 | <TitleBar | 136 | <TitleBar |
137 | menu={window['ferdium'].menu.template} | 137 | menu={window['ferdium'].menu.template} |
138 | icon="assets/images/ferdium-icon.svg" | 138 | icon="assets/images/logo.svg" |
139 | /> | 139 | /> |
140 | )} | 140 | )} |
141 | {isMac && !isFullScreen && ( | 141 | {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 { | |||
112 | <Appear timeout={1500} transitionName="slideUp"> | 112 | <Appear timeout={1500} transitionName="slideUp"> |
113 | <div className="services__no-service"> | 113 | <div className="services__no-service"> |
114 | <img | 114 | <img |
115 | src="./assets/images/moustache.svg" | 115 | src="./assets/images/logo-beard-only.svg" |
116 | alt="Logo" | 116 | alt="Logo" |
117 | style={{ maxHeight: '50vh' }} | 117 | style={{ maxHeight: '50vh' }} |
118 | /> | 118 | /> |
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 { | |||
145 | <div className="account"> | 145 | <div className="account"> |
146 | <div className="account__box account__box--flex"> | 146 | <div className="account__box account__box--flex"> |
147 | <div className="account__avatar"> | 147 | <div className="account__avatar"> |
148 | <img src="./assets/images/ferdium-icon.svg" alt="" /> | 148 | <img src="./assets/images/logo.svg" alt="" /> |
149 | </div> | 149 | </div> |
150 | <div className="account__info"> | 150 | <div className="account__info"> |
151 | <H1> | 151 | <H1> |