From 094218aca05135815e66990773fc955b2bd7df4e Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 28 Jun 2017 04:49:10 -0300 Subject: [PATCH] Ivan - Fix installation layout --- client/src/app/install/install-layout.js | 8 ++++---- client/src/app/install/install-layout.scss | 7 +------ client/src/data/languages/de.js | 1 - client/src/data/languages/en.js | 1 - client/src/data/languages/it.js | 1 - 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/client/src/app/install/install-layout.js b/client/src/app/install/install-layout.js index a7f90da5..c276340b 100644 --- a/client/src/app/install/install-layout.js +++ b/client/src/app/install/install-layout.js @@ -14,7 +14,7 @@ const steps = [ 'SERVER_REQUIREMENTS', 'DATABASE_CONFIGURATION', 'USER_SYSTEM', - 'SYSTEM_SETTINGS', + 'SETTINGS', 'ADMIN_SETUP', 'COMPLETED' ]; @@ -25,11 +25,11 @@ class InstallLayout extends React.Component { return ( -
-
+
+
OpenSupports Installation
-
+
{i18n('INSTALL_HEADER_TITLE')}
diff --git a/client/src/app/install/install-layout.scss b/client/src/app/install/install-layout.scss index f6e7cf15..21f3858a 100644 --- a/client/src/app/install/install-layout.scss +++ b/client/src/app/install/install-layout.scss @@ -12,14 +12,9 @@ &__header { text-align: left; - &-logo { - display: inline-block; - max-width: 300px; - } - + &-logo, &-text { display: inline-block; - margin-left: 20px; } &-title { diff --git a/client/src/data/languages/de.js b/client/src/data/languages/de.js index a1de2b12..c615dc9d 100644 --- a/client/src/data/languages/de.js +++ b/client/src/data/languages/de.js @@ -361,7 +361,6 @@ export default { 'REMEMBER_ME': 'Merken', 'EMAIL_LOWERCASE': 'Email', 'PASSWORD_LOWERCASE': 'Passwort', - 'SYSTEM_SETTINGS': 'System settings', 'TEST_SMTP_CONNECTION': 'SMTP-Verbindung testen', 'SMTP_CONNECTION_SUCCESS': 'SMTP-Anmeldeinformationen sind gültig.', 'SMTP_CONNECTION_ERROR': 'Kann keine Verbindung zum SMTP-Server herstellen.' diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index f8289bac..641559fa 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -361,7 +361,6 @@ export default { 'REMEMBER_ME': 'Remember me', 'EMAIL_LOWERCASE': 'email', 'PASSWORD_LOWERCASE': 'password', - 'SYSTEM_SETTINGS': 'System settings', 'TEST_SMTP_CONNECTION': 'Test SMTP connection', 'SMTP_CONNECTION_SUCCESS': 'SMTP credentials are valid.', 'SMTP_CONNECTION_ERROR': 'Can\'t connect to SMTP server.' diff --git a/client/src/data/languages/it.js b/client/src/data/languages/it.js index 92f65142..1fcd8359 100644 --- a/client/src/data/languages/it.js +++ b/client/src/data/languages/it.js @@ -361,7 +361,6 @@ export default { 'REMEMBER_ME': 'Ricordami la password', 'EMAIL_LOWERCASE': 'email', 'PASSWORD_LOWERCASE': 'password', - 'SYSTEM_SETTINGS': 'Impostazioni di sistema', 'TEST_SMTP_CONNECTION': 'Verifica connessione SMTP', 'SMTP_CONNECTION_SUCCESS': 'Le credenziali SMTP sono valide.', 'SMTP_CONNECTION_ERROR': 'Impossibile connettersi al server SMTP.'