aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2022-07-09 08:58:10 +0530
committerLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2022-07-09 09:16:17 +0530
commitf449ff2ac1dcda4ebd11d3eb66f896eedab3b3c9 (patch)
treee5262f59d8d46b3255b49ab1e8e5009347cd9c03 /src
parentUpgrade 'electron-builder' to '23.3.1' (diff)
downloadferdium-app-f449ff2ac1dcda4ebd11d3eb66f896eedab3b3c9.tar.gz
ferdium-app-f449ff2ac1dcda4ebd11d3eb66f896eedab3b3c9.tar.zst
ferdium-app-f449ff2ac1dcda4ebd11d3eb66f896eedab3b3c9.zip
Add hint text to go back to welcome screen from the login screen (fixes #449)
Diffstat (limited to 'src')
-rw-r--r--src/components/auth/Login.js9
-rw-r--r--src/i18n/locales/en-US.json1
-rw-r--r--src/styles/auth.scss4
3 files changed, 14 insertions, 0 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index eb184f1ee..a5893e181 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -61,6 +61,10 @@ const messages = defineMessages({
61 id: 'login.link.password', 61 id: 'login.link.password',
62 defaultMessage: 'Reset password', 62 defaultMessage: 'Reset password',
63 }, 63 },
64 backToWelcome: {
65 id: 'login.backToWelcome',
66 defaultMessage: 'Click the Ferdium icon to go back to the Welcome screen',
67 },
64}); 68});
65 69
66class Login extends Component { 70class Login extends Component {
@@ -186,6 +190,11 @@ class Login extends Component {
186 {intl.formatMessage(messages.passwordLink)} 190 {intl.formatMessage(messages.passwordLink)}
187 </Link> 191 </Link>
188 </div> 192 </div>
193 <div className="auth__help">
194 <span>
195 {intl.formatMessage(messages.backToWelcome)}
196 </span>
197 </div>
189 </div> 198 </div>
190 ); 199 );
191 } 200 }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 37443200f..27d825657 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -64,6 +64,7 @@
64 "locked.touchId": "Unlock with Touch ID", 64 "locked.touchId": "Unlock with Touch ID",
65 "locked.touchIdPrompt": "unlock via Touch ID", 65 "locked.touchIdPrompt": "unlock via Touch ID",
66 "locked.unlockWithPassword": "Unlock with Password", 66 "locked.unlockWithPassword": "Unlock with Password",
67 "login.backToWelcome": "Click the Ferdium icon to go back to the Welcome screen",
67 "login.changeServer": "Change here!", 68 "login.changeServer": "Change here!",
68 "login.changeServerMessage": "You are using {serverNameParse} Server, do you want to switch?", 69 "login.changeServerMessage": "You are using {serverNameParse} Server, do you want to switch?",
69 "login.customServerQuestion": "Using a custom Ferdium server?", 70 "login.customServerQuestion": "Using a custom Ferdium server?",
diff --git a/src/styles/auth.scss b/src/styles/auth.scss
index 710cfe10b..33e3a4a78 100644
--- a/src/styles/auth.scss
+++ b/src/styles/auth.scss
@@ -126,6 +126,10 @@
126 } 126 }
127 } 127 }
128 128
129 .auth__help {
130 padding: 5% 2%;
131 }
132
129 .auth__adlk { 133 .auth__adlk {
130 bottom: 15px; 134 bottom: 15px;
131 position: absolute; 135 position: absolute;