diff --git a/core/css/guest.css b/core/css/guest.css index ab54936dc179cef38630041c9acfae62ab46a18d..14d664bfd0b9b93ce87ec1b51f412fd5b59f82ed 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -4,13 +4,14 @@ /* Default and reset */ @font-face { - font-family: "Century Gothic Regular"; - font-style: normal; - font-weight: normal; - src: local("Century Gothic Regular"), - url("../webfonts/GOTHIC.woff") format("woff"); -} - + font-family: 'Montserrat'; + src: url('../webfonts/Montserrat.woff2') format('woff2'), + url('../webfonts/Montserrat.woff') format('woff'); + /* font-weight: 600; */ + /* font-style: normal; */ + font-display: swap; + letter-spacing: 1px; + } /* Mobile font sizes */ @media screen and (max-width: 768px) { #body-login #user, #body-login #password { @@ -29,6 +30,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr font-family: inherit; vertical-align: baseline; cursor: default; + font-family: 'Montserrat'; } html { @@ -101,9 +103,12 @@ body { #body-login .wrapper .update.two-factor h3, #body-login .wrapper .update.two-factor p, #body-login .wrapper .two-factor-secondary { - color: white; + color: #808080; +} +#body-login .wrapper .two-factor-secondary{ + border-color: #808080; + text-decoration: underline; } - #body-login a:not(.button):hover, #body-login a:not(.button):focus { @@ -151,7 +156,7 @@ body { background-repeat: no-repeat; background-size: 100px; background-position: center; - width: 256px; + width: 180px; min-height: 128px; max-height: 200px; margin: 0 auto; @@ -166,9 +171,11 @@ body { } .wrapper { - width: 96%; - max-width: 500px; - margin-top: 10vh; + width: 100%; + height: 100vh; + max-width: unset; + margin-top: 0; + display: inline; } /* Default FORM */ @@ -571,7 +578,7 @@ form .warning input[type='checkbox'] + label { } .body-login-container.two-factor { - max-width: 290px; + max-width: 100%; margin: 15px auto 0; } @@ -613,6 +620,8 @@ form .warning input[type='checkbox'] + label { width: 100px; display: block; margin: 0 auto; + background-color: gray; + border-radius: 10px; } .two-factor-submit { @@ -799,11 +808,15 @@ form #selectDbType label span { user-select: text; } -.body-login-container h2, +.body-login-container h2 +{ + color: #fff; + text-align: center; +} .warning h2, .update h2, .error h2 { - color: #fff; + color: #333; text-align: center; } @@ -897,8 +910,8 @@ p.info { } .update .appList { - list-style: disc; - text-align: left; + list-style: inside; + text-align: center; margin-left: 25px; margin-right: 25px; } @@ -1054,7 +1067,11 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- /* FOOTER */ footer { height: 70px; - margin-top: auto; + width: 100%; + position: absolute; + bottom: 0; + right: 0; + padding-bottom: 15px; } footer .info .entity-name { @@ -1084,26 +1101,41 @@ a.legal { background-color: #ffffff !important; background-image: none !important; color: #808080; - font-family: "Century Gothic Regular"; + font-family: "Montserrat"; } #body-login .v-align { - border: 1px solid #DCDCDC; + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + gap: 40px; + height: 100%; + background: #FFFFFF; + flex: none; + order: 0; + align-self: stretch; + flex-grow: 0; box-sizing: border-box; - border-radius: 8px; - margin: 32px 0px; padding: 64px 44px; + position: relative; +} +#body-login .warning-messsage { + width: 30%; + margin: 5% auto; + height: auto; + gap: 0; } - #body-login #user, #body-login #password, #body-login .totp-form > input[type="tel"] { padding: 12px 16px; - width: 424px; + width: 100%; height: 48px; border: 1px solid #E6E8E9; box-sizing: border-box; border-radius: 8px; margin: 12px 0px; + font-size: 16px; } #body-login .groupbottom, @@ -1120,7 +1152,7 @@ a.legal { #body-login #submit-wrapper, #body-login #reset-password-wrapper { background-color: #ffffff; - margin-top: 26px; + margin-top: 0px; } #body-login #submit-form, @@ -1148,15 +1180,34 @@ a.legal { #body-login #submit-form, #body-login .two-factor-submit { - width: 190px; + box-sizing: border-box; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + padding: 12px 16px; + gap: 10px; + width: 100%; + height: 42px; + background: #0086FF; + border-radius: 24px; + font-size: 16px; } #body-login #reset-password-submit { - width: 220px; -} - -#body-login form { - margin-top: 50px; + /* width: 220px; */ + box-sizing: border-box; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + padding: 12px 16px; + gap: 10px; + width: 100%; + height: 42px; + background: #0086FF; + border-radius: 24px; + font-size: 16px; } #body-login fieldset { @@ -1187,32 +1238,34 @@ a.legal { } #body-login #submit-wrapper .submit-icon { - top: 32px; + top: 45px; right: 30%; } #reset-password-wrapper .submit-icon { - top: 32px; - right: 25%; + top: 45px; + right: 30%; } #body-login .warning, #body-login .error { max-width: 100%; - color: white; - background-color: #fb3845; + color: #fb3845; + background-color: white; font-size: 1.1em; text-align: center; + border: 1px solid; } #body-login .update, #body-login .success { - color: white; - background-color: #3ad975; + color: #029f3c; + background-color: white; justify-content: center !important; width: 92%; margin-left: 0; margin-right: 0; + border: 1px solid; } /* #body-login #user:hover, @@ -1248,3 +1301,209 @@ a.legal { #body-login .two-factor-submit:hover { opacity: 0.9; } +.banner-right-align { + text-align: left; + display: flex; + align-items: center; + height: 100%; + justify-content: center; + vertical-align: middle; + float: left; + width: 70%; + background: linear-gradient(127.57deg, #FF7A00 3.94%, #ED1C61 76.89%); +} +.lines{ + background-image: url(../img/lines.png); + background-repeat: no-repeat; + height: 100%; + background-size: cover; + position: absolute; + top: 0; + left: 0; + width: 20%; +} +.banner-content { + font-family: 'Montserrat'; + font-style: normal; + color: #FFFFFF; + text-align: left; +} +.banner-content-get-free-murena +{ + font-weight: 700; + font-size: 32px; + line-height: 150%; + display: block; + letter-spacing: -1px; +} +.banner-content-why-murena +{ + font-weight: 400; + font-size: 18px; + line-height: 150%; + margin: 10% 0 15% 0; +} +.banner-content-create-button button +{ + border: 1px solid #FFFFFF; + border-radius: 24px; + background: transparent; + color: white; + width: 70%; +} +.banner-content-create-button a +{ + border: 1px solid #FFFFFF !important; + border-radius: 24px !important; + background: transparent; + color: white !important; + width: 70% !important; + display: inline-block; + padding: 12px; + font-weight: bold; + cursor: pointer; + text-align: center; +} +.banner-content-create-button a:hover{ + text-decoration: none !important; + opacity: 0.9; +} +.banner-content-why-murena li { + list-style: inside; +} +.v-align header{ + width: 100%; +} +.sign-in-label { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 500; + font-size: 21px; + letter-spacing: -0.44px; + color: #333333; +} +.v-align main +{ + width: 100%; + margin: 0 auto; +} +#lost-password{ + color: #0086FF !important; + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400 !important; + font-size: 16px !important; + line-height: 150%; +} + .v-align main .grouptop, .v-align main .groupbottom{ + position: relative; + margin: 10px 0; +} +.v-align main .grouptop input, .v-align main .groupbottom input +{ + padding: 12px 16px; + width: 424px; + height: 48px; + border: 1px solid #E6E8E9; + box-sizing: border-box; + margin: 12px 0px; + border-bottom: 1px solid #E6E8E9 !important; + border-bottom-left-radius: 8px !important; + border-bottom-right-radius: 8px !important; + border-top-right-radius: 8px !important; + border-top-left-radius: 8px !important; + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + font-size: 16px; + line-height: 150%; +} +.pos-fixed{ + position: fixed !important; +} +.banner-content-get-free-murena p{ + width: 75%; +} +@media only screen and (max-width: 1440px) { + .banner-right-align { + width: 65%; + } +} +@media only screen and (max-width: 1050px) { + #body-login .v-align{ + height: 80%; + } + .banner-right-align { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + box-ordinal-group: 2; + width: 100%; + position: relative; + height: 70%; + } + + .v-align { + -webkit-box-ordinal-group: 1; + -moz-box-ordinal-group: 1; + box-ordinal-group: 1; + width: 70%; + margin: 0 auto; + } + .wrapper{ + display: -webkit-box; + display: -moz-box; + display: box; + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + box-orient: vertical; + } + footer{ + bottom: -100%; + } + .lines{ + width: 30%; + } +} +@media only screen and (max-width: 640px) { + .wrapper{ + position: relative; + } + #body-login .v-align{ + width: 90%; + margin: 0 auto; + position: unset !important; + } + .banner-right-align{ + height: 50%; + } + .banner-right-align .banner-content{ + margin-left: 10%; + -ms-transform: translateY(5%); + transform: translateY(5%); + } + .banner-content-get-free-murena{ + font-size: 18px; + } + .banner-content-why-murena{ + font-size: 14px; + margin: 10% 0 10% 0; + } + footer{ + bottom: -40%; + } + .lines{ + display: none; + } +} +@media only screen and (max-width: 360px) { + .v-align { + width: 100%; + margin: 0 auto; + } + .banner-right-align{ + display: none; + } + footer { + bottom: 0; + } +} \ No newline at end of file diff --git a/core/css/server.css b/core/css/server.css index f2e64514ca190c49dedb03bd791e946ad6747e8a..a8641ffd9e6d8eaf0f2e334924b17042590525e7 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -359,10 +359,7 @@ #header .logo { background-size: auto; } - #body-login #header .logo { - margin-bottom: 22px; - } - + input.primary, #alternative-logins li a { background-color: #999999; @@ -1703,7 +1700,6 @@ font-family: 'Roboto'; letter-spacing: 1px; } - #header{border-bottom: 1px solid #E6E8E9;} #filestable thead{background-color: unset !important ;} #recommendations{height: 100px !important;} .recommendation{border: 1px solid #E6E8E9;padding: 10px !important;margin-bottom: 5px;border-radius: 6px !important;} diff --git a/core/img/lines.png b/core/img/lines.png new file mode 100644 index 0000000000000000000000000000000000000000..2190baf1abd871bfef43af875bdaa9b206625ea1 Binary files /dev/null and b/core/img/lines.png differ diff --git a/core/webfonts/Montserrat.woff b/core/webfonts/Montserrat.woff new file mode 100644 index 0000000000000000000000000000000000000000..948895257641619db1720650134ea485a696568d Binary files /dev/null and b/core/webfonts/Montserrat.woff differ diff --git a/core/webfonts/Montserrat.woff2 b/core/webfonts/Montserrat.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..db978a8c9f62bfae2c10517afd0cf804f0d962aa Binary files /dev/null and b/core/webfonts/Montserrat.woff2 differ diff --git a/core/webfonts/montserrat.woff2 b/core/webfonts/montserrat.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..e02a41b4e856477ede807b7d90e6c89057ac14fc Binary files /dev/null and b/core/webfonts/montserrat.woff2 differ diff --git a/defaults.php b/defaults.php index 9caf3780ac7f430fb0a51b3f4000ab8005a64192..e80d2728d98e47f778dfe4463a4598200e50fd87 100644 --- a/defaults.php +++ b/defaults.php @@ -41,7 +41,7 @@ class OC_Theme { * @return string title */ public function getTitle() { - return '/e/'; + return 'Murena'; } /** @@ -49,7 +49,7 @@ class OC_Theme { * @return string title */ public function getName() { - return '/e/'; + return 'Murena'; } /** @@ -57,7 +57,7 @@ class OC_Theme { * @return string title */ public function getHTMLName() { - return '/e/'; + return 'Murena'; } /** @@ -84,26 +84,41 @@ class OC_Theme { public function getLogoClaim() { return ''; } + + /** + * Returns the terms and condition URL + * @return string URL + */ + public function getTermsUrl() { + return 'https://murena.com/terms-conditions/'; + } + + /** + * Returns the terms and condition URL + * @return string URL + */ + public function getPrivacyUrl() { + return 'https://murena.com/privacy-policy/'; + } /** * Returns short version of the footer * @return string short footer */ public function getShortFooter() { - $footer = '© ' . date('Y') . ' ' . $this->getEntity() . '' . - '
' . $this->getSlogan(); + $footer = 'Copyright © ' . date('Y') . ' ' . $this->getName() . '' ; return $footer; } - /** * Returns long version of the footer * @return string long footer */ public function getLongFooter() { - $footer = '© ' . date('Y') . ' ' . $this->getEntity() . '' . - '
' . $this->getSlogan(); - + $footer = '

Copyright © ' . date('Y') .' '.$this->getName() .'. All Rights Reserved.

' ; + $footer .= '

'.' '.(\OC::$server->getL10N('lib')->t('Terms & Conditions')).' '; + $footer .= ' - '.' '.(\OC::$server->getL10N('lib')->t('Privacy Policy')).'

'; + return $footer; } diff --git a/l10n/de.js b/l10n/de.js new file mode 100644 index 0000000000000000000000000000000000000000..7463ef24b268f1b4d5a83400ec8a3658a95065d4 --- /dev/null +++ b/l10n/de.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "core", + { + "Get your FREE Murena account now" : "Holen Sie sich jetzt Ihr KOSTENLOSES Murena-Konto", + "1GB storage for FREE to store and sync your pictures & videos.": "1 GB Speicherplatz KOSTENLOS zum Speichern und Synchronisieren Ihrer Bilder und Videos.", + "Edit your documents online.": "Bearbeiten Sie Ihre Dokumente online.", + "Your unique email address @murena.io": "Ihre eindeutige E-Mail-Adresse @murena.io", + "Sync calendar and contacts with the cloud": "Kalender und Kontakte mit der Cloud synchronisieren", + "and many new features added regularly!": "und viele neue Funktionen, die regelmäßig hinzugefügt werden!", + "Create My Account": "Erstelle meinen Account", + "Sign in to your account": "Melden Sie sich bei Ihrem Konto an", + "Terms & Conditions": "algemene voorwaarden", + "Privacy Policy": "Privacybeleid" +}, +"nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/de.json b/l10n/de.json new file mode 100644 index 0000000000000000000000000000000000000000..06479711ccdab4d6140291f4b110b0c4b46c872f --- /dev/null +++ b/l10n/de.json @@ -0,0 +1,15 @@ +{ + "translations": { + "Get your FREE Murena account now" : "Holen Sie sich jetzt Ihr KOSTENLOSES Murena-Konto", + "1GB storage for FREE to store and sync your pictures & videos.": "1 GB Speicherplatz KOSTENLOS zum Speichern und Synchronisieren Ihrer Bilder und Videos.", + "Edit your documents online.": "Bearbeiten Sie Ihre Dokumente online.", + "Your unique email address @murena.io": "Ihre eindeutige E-Mail-Adresse @murena.io", + "Sync calendar and contacts with the cloud": "Kalender und Kontakte mit der Cloud synchronisieren", + "and many new features added regularly!": "und viele neue Funktionen, die regelmäßig hinzugefügt werden!", + "Create My Account": "Erstelle meinen Account", + "Sign in to your account": "Melden Sie sich bei Ihrem Konto an", + "Terms & Conditions": "algemene voorwaarden", + "Privacy Policy": "Privacybeleid" + }, + "pluralForm": "nplurals=2; plural=(n != 1);" +} diff --git a/l10n/en.js b/l10n/en.js new file mode 100755 index 0000000000000000000000000000000000000000..dbf4c0080afdd658ea5971b36b4e2e74cc4f0108 --- /dev/null +++ b/l10n/en.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "core", + { + "Get your FREE Murena account now" : "Get your FREE Murena account now", + "1GB storage for FREE to store and sync your pictures & videos.": "1GB storage for FREE to store and sync your pictures & videos.", + "Edit your documents online.": "Edit your documents online.", + "Your unique email address @murena.io": "Your unique email address @murena.io", + "Sync calendar and contacts with the cloud": "Sync calendar and contacts with the cloud", + "and many new features added regularly!": "and many new features added regularly!", + "Create My Account": "Create My Account", + "Sign in to your account": "Sign in to your account", + "Terms & Conditions": "Terms & Conditions", + "Privacy Policy": "Privacy Policy" +}, +"nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/en.json b/l10n/en.json new file mode 100755 index 0000000000000000000000000000000000000000..eef2c3d673498d6a3c9281ccf2f8373dc6b4f2e9 --- /dev/null +++ b/l10n/en.json @@ -0,0 +1,15 @@ +{ + "translations": { + "Get your FREE Murena account now" : "Get your FREE Murena account now", + "1GB storage for FREE to store and sync your pictures & videos.": "1GB storage for FREE to store and sync your pictures & videos.", + "Edit your documents online.": "Edit your documents online.", + "Your unique email address @murena.io": "Your unique email address @murena.io", + "Sync calendar and contacts with the cloud": "Sync calendar and contacts with the cloud", + "and many new features added regularly!": "and many new features added regularly!", + "Create My Account": "Create My Account", + "Sign in to your account": "Sign in to your account", + "Terms & Conditions": "Terms & Conditions", + "Privacy Policy": "Privacy Policy" + }, + "pluralForm": "nplurals=2; plural=(n != 1);" +} diff --git a/l10n/es.js b/l10n/es.js new file mode 100644 index 0000000000000000000000000000000000000000..1e9b9580a0b71a938ce7fb6bc24252944792a7a4 --- /dev/null +++ b/l10n/es.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "core", + { + "Get your FREE Murena account now" : "Obtenga su cuenta Murena GRATIS ahora", + "1GB storage for FREE to store and sync your pictures & videos.": "1 GB de almacenamiento GRATIS para almacenar y sincronizar tus fotos y videos.", + "Edit your documents online.": "Edite sus documentos en línea.", + "Your unique email address @murena.io": "Su dirección de correo electrónico única @murena.io", + "Sync calendar and contacts with the cloud": "Sincroniza calendario y contactos con la nube", + "and many new features added regularly!": "¡y muchas características nuevas agregadas regularmente!", + "Create My Account": "Crear mi cuenta", + "Sign in to your account": "Iniciar sesión en su cuenta", + "Terms & Conditions": "Términos y condiciones", + "Privacy Policy": "Política de privacidad" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/l10n/es.json new file mode 100644 index 0000000000000000000000000000000000000000..96bd5b725862740d26553e1de33d2e9b9f02d3f9 --- /dev/null +++ b/l10n/es.json @@ -0,0 +1,15 @@ +{ + "translations": { + "Get your FREE Murena account now" : "Obtenga su cuenta Murena GRATIS ahora", + "1GB storage for FREE to store and sync your pictures & videos.": "1 GB de almacenamiento GRATIS para almacenar y sincronizar tus fotos y videos.", + "Edit your documents online.": "Edite sus documentos en línea.", + "Your unique email address @murena.io": "Su dirección de correo electrónico única @murena.io", + "Sync calendar and contacts with the cloud": "Sincroniza calendario y contactos con la nube", + "and many new features added regularly!": "¡y muchas características nuevas agregadas regularmente!", + "Create My Account": "Crear mi cuenta", + "Sign in to your account": "Iniciar sesión en su cuenta", + "Terms & Conditions": "Términos y condiciones", + "Privacy Policy": "Política de privacidad" + }, + "pluralForm": "nplurals=2; plural=(n != 1);" +} diff --git a/l10n/fr.js b/l10n/fr.js new file mode 100644 index 0000000000000000000000000000000000000000..307483d3dae3b5e5d3cd4c8bd4ebc09cf487eb08 --- /dev/null +++ b/l10n/fr.js @@ -0,0 +1,15 @@ +OC.L10N.register( + "core", + { + "Get your FREE Murena account now" : "Obtenez votre compte Murena GRATUIT maintenant", + "1GB storage for FREE to store and sync your pictures & videos.": "1 Go de stockage GRATUIT pour stocker et synchroniser vos photos et vidéos.", + "Edit your documents online.": "Modifiez vos documents en ligne.", + "Your unique email address @murena.io": "Votre adresse e-mail unique @murena.io", + "Sync calendar and contacts with the cloud": "Synchroniser le calendrier et les contacts avec le cloud", + "and many new features added regularly!": "et de nombreuses nouvelles fonctionnalités ajoutées régulièrement !", + "Create My Account": "Créer mon compte", + "Sign in to your account": "Connectez-vous à votre compte", + "Terms & Conditions": "termes et conditions", + "Privacy Policy": "Politique de confidentialité" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/fr.json b/l10n/fr.json new file mode 100644 index 0000000000000000000000000000000000000000..90890d1be0eeac99387817b750be1cabcd24cb67 --- /dev/null +++ b/l10n/fr.json @@ -0,0 +1,15 @@ +{ + "translations": { + "Get your FREE Murena account now" : "Obtenez votre compte Murena GRATUIT maintenant", + "1GB storage for FREE to store and sync your pictures & videos.": "1 Go de stockage GRATUIT pour stocker et synchroniser vos photos et vidéos.", + "Edit your documents online.": "Modifiez vos documents en ligne.", + "Your unique email address @murena.io": "Votre adresse e-mail unique @murena.io", + "Sync calendar and contacts with the cloud": "Synchroniser le calendrier et les contacts avec le cloud", + "and many new features added regularly!": "et de nombreuses nouvelles fonctionnalités ajoutées régulièrement !", + "Create My Account": "Créer mon compte", + "Sign in to your account": "Connectez-vous à votre compte", + "Terms & Conditions": "termes et conditions", + "Privacy Policy": "Politique de confidentialité" + }, + "pluralForm": "nplurals=2; plural=(n != 1);" +}