diff --git a/core/css/guest.css b/core/css/guest.css index 1c9e82b04be9b055f4c0c727bd42787348127b3e..0091e2d2feb87cd56e716774c179c847e3705bfe 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1067,13 +1067,13 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- /* FOOTER */ footer { - height: 70px; - width: 100%; background-color: #ffffff; - margin-top: 15%; + position: absolute; + right: 5%; bottom: 0; - right: 0; padding-bottom: 15px; + max-width: 350px; + transition: all 0.3s linear; } footer .info .entity-name { @@ -1110,25 +1110,24 @@ a.legal { flex-direction: column; justify-content: center; align-items: flex-start; - height: auto; + height: 100%; background-color: #FFFFFF; flex: none; order: 0; align-self: stretch; flex-grow: 0; box-sizing: border-box; - padding: 15vh 5vh; + padding: 5vh; position: relative; overflow: auto; max-height: 100%; transition: all 0.3s linear; } #body-login .warning-messsage { - width: 30%; - margin: 5% auto; - height: auto; - gap: 0; - overflow: hidden; + width: 50%; + margin: 0 auto; + margin-top: 0; + padding: 0; } #body-login #user, #body-login #password, @@ -1333,6 +1332,7 @@ a.legal { font-style: normal; color: #FFFFFF; text-align: left; + max-width: 60%; } .banner-content-get-free-murena { @@ -1363,7 +1363,7 @@ a.legal { border-radius: 24px !important; background: transparent; color: white !important; - width: 70% !important; + width: 70%; display: inline-block; padding: 12px; font-weight: bold; @@ -1379,7 +1379,10 @@ a.legal { } .v-align header{ width: 100%; - margin-bottom: 5%; + margin-top: 10vh; +} +.warning-messsage header{ + margin-top: 0; } .sign-in-label { font-family: 'Montserrat'; @@ -1389,10 +1392,14 @@ a.legal { letter-spacing: -0.44px; color: #333333; } -.v-align main -{ +.v-align main{ width: 100%; margin: 0 auto; + margin-bottom: 15vh; +} +.warning-messsage main{ + margin-bottom: 0; + max-width: 90%; } #lost-password{ color: #0086FF !important; @@ -1428,36 +1435,43 @@ a.legal { .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) { + .width0{ + width: 0 !important; + height: 0 !important; + } + .banner-content{ + max-width: 80%; + } #body-login .v-align{ - height: 80%; + height: 70%; overflow: hidden; + width: 70%; } .banner-right-align { -webkit-box-ordinal-group: 2; -moz-box-ordinal-group: 2; box-ordinal-group: 2; width: 100%; + height: 60%; position: relative; - height: 90%; } .banner-content-create-button{ text-align: center; } - + .banner-content-create-button a{ + width: 90%; + } .v-align { -webkit-box-ordinal-group: 1; -moz-box-ordinal-group: 1; box-ordinal-group: 1; - width: 70%; + width: 50%; margin: 0 auto; } .wrapper{ @@ -1470,14 +1484,18 @@ a.legal { } footer{ bottom: 0; - position: fixed; height: auto; + -webkit-box-ordinal-group: 3; + -moz-box-ordinal-group: 3; + box-ordinal-group: 3; + margin: 0 auto; + position: unset; } .lines{ width: 30%; } - #body-login .warning-messsage { - width: 50%; + .banner-content-why-murena{ + margin: 5% 0 5% 0; } } @media only screen and (max-width: 640px) { @@ -1489,25 +1507,16 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; - } - .banner-right-align{ - height: 60%; - } - .banner-right-align .banner-content{ - margin-left: 10%; - margin-top: -25%; + height: unset; } .banner-content-get-free-murena{ font-size: 18px; } + .banner-right-align{ + height: 50%; + } .banner-content-why-murena{ font-size: 14px; - margin: 10% 0 10% 0; - } - footer{ - bottom: 0; - position: fixed; - height: auto; } .lines{ display: none; @@ -1516,18 +1525,14 @@ a.legal { width: 80%; } } -@media only screen and (max-width: 360px) { - .v-align { - width: 100%; - margin: 0 auto; - } +@media only screen and (max-width: 375px) { .banner-right-align{ display: none; } - footer { - bottom: 0; - position: fixed; - height: auto; + .v-align { + width: 100%; + margin: 0 auto; + height: 100%; } #body-login .warning-messsage { width: 90%; @@ -1536,3 +1541,22 @@ a.legal { .width0{ width: 0; } +.pos-relative{ + position: relative; +} +.forgotpass-footer { + margin: 0 auto; + position: unset; + transition: all 0.3s linear; +} +.have-an-account { + margin-top: 10px; + color: #333333; + border-top: 1px solid #d7d7d7; + border-width: thin; + padding: 15px; +} +.have-an-account a{ + color: #0086ff !important; +} + diff --git a/core/js/login.js b/core/js/login.js index 99397a7bd932af2a190059d50b6320e69e091c4a..03929d77a8961d79f13f3969fe20b91325ce5d14 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,12 +1,20 @@ $(document).on('click','#lost-password', function(){ - $('.banner-content').hide('slow'); - $('.banner-right-align').addClass('width0'); - $('.lines').hide(); - $('.v-align').addClass('warning-messsage'); + if(window.innerWidth > 1050){ + $('.banner-content').hide('slow'); + $('.have-an-account').hide('slow'); + $('.banner-right-align').addClass('width0'); + $('.lines').hide(); + $('.v-align').addClass('warning-messsage'); + $('footer').addClass('forgotpass-footer'); + } }); $(document).on('click','.lost-password-container a', function(){ - $('.banner-right-align').removeClass('width0'); - $('.v-align').removeClass('warning-messsage'); - $('.lines').show('slow'); - $('.banner-content').show('slow'); + if(window.innerWidth > 1050){ + $('.banner-right-align').removeClass('width0'); + $('.v-align').removeClass('warning-messsage'); + $('footer').removeClass('forgotpass-footer'); + $('.lines').show('slow'); + $('.banner-content').show('slow'); + $('.have-an-account').show('slow'); + } }); diff --git a/core/l10n/de.js b/core/l10n/de.js index eca7e88965c960a5ccfc0d95bbe042176168adf9..9ff89a01cace35ece05260de8075fde75c400ea3 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -12,6 +12,8 @@ OC.L10N.register( "Terms & Conditions": "algemene voorwaarden", "Privacy Policy": "Privacybeleid", "All Rights Reserved": "Alle rechten voorbehouden", - "Copyright": "Auteursrechten" + "Copyright": "Auteursrechten", + "Don't have an account yet?": "Heb je nog geen account?", + "Create an account": "Account aanmaken" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/de.json b/core/l10n/de.json index 10af8cc17984adb21c3ef5e558988e9c24e333bf..0ad9c981dc36ffebc76ea4cdc7e1746bbfc995ff 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -11,7 +11,9 @@ "Terms & Conditions": "algemene voorwaarden", "Privacy Policy": "Privacybeleid", "All Rights Reserved": "Alle rechten voorbehouden", - "Copyright": "Auteursrechten" + "Copyright": "Auteursrechten", + "Don't have an account yet?": "Heb je nog geen account?", + "Create an account": "Account aanmaken" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/core/l10n/en.js b/core/l10n/en.js index 8ad9222c84a012867c0e3829c7b7776fd527de43..5292e9b0ab924f0693774b972be42a7e3b139c78 100755 --- a/core/l10n/en.js +++ b/core/l10n/en.js @@ -12,6 +12,8 @@ OC.L10N.register( "Terms & Conditions": "Terms & Conditions", "Privacy Policy": "Privacy Policy", "All Rights Reserved": "All Rights Reserved", - "Copyright": "Copyright" + "Copyright": "Copyright", + "Don't have an account yet?": "Don't have an account yet?", + "Create an account": "Create an account" }, "nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/core/l10n/en.json b/core/l10n/en.json index 2da6ba2927d530ebd05d25d862c7e141a5202f27..bc29fbc262da0ca3adbd4da5560878304b4bc834 100755 --- a/core/l10n/en.json +++ b/core/l10n/en.json @@ -11,7 +11,9 @@ "Terms & Conditions": "Terms & Conditions", "Privacy Policy": "Privacy Policy", "All Rights Reserved": "All Rights Reserved", - "Copyright": "Copyright" + "Copyright": "Copyright", + "Don't have an account yet?": "Don't have an account yet?", + "Create an account": "Create an account" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/core/l10n/es.js b/core/l10n/es.js index 1909a336daabb112692ae76450cf85d34b56d350..e188605a4174a282d01acc80be35c72241bd579a 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -12,6 +12,8 @@ OC.L10N.register( "Terms & Conditions": "Términos y condiciones", "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", - "Copyright": "Derechos de autor" + "Copyright": "Derechos de autor", + "Don't have an account yet?": "¿Aún no tienes una cuenta?", + "Create an account": "Regístrate!" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/es.json b/core/l10n/es.json index 708147bb6e01d9fe521e18652d89645b8cf0122f..0fbc88d5f3b6f03c219cdd65c4726fb6cbb0d2eb 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -11,7 +11,9 @@ "Terms & Conditions": "Términos y condiciones", "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", - "Copyright": "Derechos de autor" + "Copyright": "Derechos de autor", + "Don't have an account yet?": "¿Aún no tienes una cuenta?", + "Create an account": "Regístrate!" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 4a54859aa24745f2b4c493f3eb9078ec81994a1b..8295ab6e33ce7907696e6613f6b2f6568c67033c 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -12,6 +12,8 @@ OC.L10N.register( "Terms & Conditions": "termes et conditions", "Privacy Policy": "Politique de confidentialité", "All Rights Reserved": "Tous les droits sont réservés", - "Copyright": "droits d'auteur" + "Copyright": "droits d'auteur", + "Don't have an account yet?": "Vous n'avez pas encore de compte ?", + "Create an account": "Créer un compte" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/fr.json b/core/l10n/fr.json index f8ec84aae604060933d39e6f6f7dbd8de0f6f9f1..a36cbe839c342fb47ffc13ab32581922a78f90de 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -11,7 +11,9 @@ "Terms & Conditions": "termes et conditions", "Privacy Policy": "Politique de confidentialité", "All Rights Reserved": "Tous les droits sont réservés", - "Copyright": "droits d'auteur" + "Copyright": "droits d'auteur", + "Don't have an account yet?": "Vous n'avez pas encore de compte ?", + "Create an account": "Créer un compte" }, "pluralForm": "nplurals=2; plural=(n != 1);" }