From 37fe6965e584471b3f52890b4c48ddd952312713 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 13 Jun 2022 15:03:12 +0530 Subject: [PATCH 01/25] footer issue --- core/css/guest.css | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 1c9e82b0..951f90ca 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1070,7 +1070,7 @@ footer { height: 70px; width: 100%; background-color: #ffffff; - margin-top: 15%; + /* position: absolute; */ bottom: 0; right: 0; padding-bottom: 15px; @@ -1106,18 +1106,19 @@ a.legal { font-family: "Montserrat"; } #body-login .v-align { + position: relative; display: flex; 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%; @@ -1126,9 +1127,10 @@ a.legal { #body-login .warning-messsage { width: 30%; margin: 5% auto; - height: auto; + height: 80%; gap: 0; - overflow: hidden; + overflow: auto; + margin-top: 0%; } #body-login #user, #body-login #password, @@ -1379,7 +1381,7 @@ a.legal { } .v-align header{ width: 100%; - margin-bottom: 5%; + margin-top: 10vh; } .sign-in-label { font-family: 'Montserrat'; @@ -1389,10 +1391,10 @@ a.legal { letter-spacing: -0.44px; color: #333333; } -.v-align main -{ +.v-align main{ width: 100%; margin: 0 auto; + margin-bottom: 10vh; } #lost-password{ color: #0086FF !important; -- GitLab From c494d0b1156467b38623aaa992eb8874a626be32 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 13 Jun 2022 15:04:32 +0530 Subject: [PATCH 02/25] footer issue #1 --- core/css/guest.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 951f90ca..ef61a722 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1070,7 +1070,6 @@ footer { height: 70px; width: 100%; background-color: #ffffff; - /* position: absolute; */ bottom: 0; right: 0; padding-bottom: 15px; -- GitLab From 4a79da0ea7711912009bec142f02dbf2469d7c08 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 11:41:02 +0530 Subject: [PATCH 03/25] footer design --- core/css/guest.css | 60 ++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index ef61a722..0887b291 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1067,12 +1067,12 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- /* FOOTER */ footer { - height: 70px; - width: 100%; background-color: #ffffff; + position: absolute; + right: 5%; bottom: 0; - right: 0; padding-bottom: 15px; + max-width: 350px; } footer .info .entity-name { @@ -1105,7 +1105,6 @@ a.legal { font-family: "Montserrat"; } #body-login .v-align { - position: relative; display: flex; flex-direction: column; justify-content: center; @@ -1334,6 +1333,7 @@ a.legal { font-style: normal; color: #FFFFFF; text-align: left; + max-width: 60%; } .banner-content-get-free-murena { @@ -1364,7 +1364,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; @@ -1393,7 +1393,7 @@ a.legal { .v-align main{ width: 100%; margin: 0 auto; - margin-bottom: 10vh; + margin-bottom: 15vh; } #lost-password{ color: #0086FF !important; @@ -1429,36 +1429,39 @@ 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) { + .banner-content{ + max-width: 80%; + } #body-login .v-align{ height: 80%; overflow: hidden; + width: 70%; } .banner-right-align { -webkit-box-ordinal-group: 2; -moz-box-ordinal-group: 2; box-ordinal-group: 2; width: 100%; - position: relative; height: 90%; + position: relative; } .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{ @@ -1471,8 +1474,12 @@ 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%; @@ -1490,25 +1497,16 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; + width: 100%; } - .banner-right-align{ - height: 60%; - } - .banner-right-align .banner-content{ - margin-left: 10%; - margin-top: -25%; - } - .banner-content-get-free-murena{ + .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; @@ -1525,11 +1523,6 @@ a.legal { .banner-right-align{ display: none; } - footer { - bottom: 0; - position: fixed; - height: auto; - } #body-login .warning-messsage { width: 90%; } @@ -1537,3 +1530,6 @@ a.legal { .width0{ width: 0; } +.pos-relative{ + position: relative; +} -- GitLab From 19c5b1aef5dee3dbee9cd8650a0bbc6d3b520eba Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 11:47:27 +0530 Subject: [PATCH 04/25] login page css --- core/css/guest.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 0887b291..3dd0f5cd 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1439,7 +1439,7 @@ a.legal { max-width: 80%; } #body-login .v-align{ - height: 80%; + height: 60%; overflow: hidden; width: 70%; } @@ -1448,7 +1448,7 @@ a.legal { -moz-box-ordinal-group: 2; box-ordinal-group: 2; width: 100%; - height: 90%; + height: 60%; position: relative; } .banner-content-create-button{ @@ -1497,7 +1497,7 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; - width: 100%; + height: 80%; } .banner-content-get-free-murena{ font-size: 18px; @@ -1519,6 +1519,7 @@ a.legal { .v-align { width: 100%; margin: 0 auto; + height: 100%; } .banner-right-align{ display: none; -- GitLab From 6411c27a52bb56fddac92febaf6346d231e989ed Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 11:51:13 +0530 Subject: [PATCH 05/25] login page css #2 --- core/css/guest.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index 3dd0f5cd..7af06b20 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1487,6 +1487,9 @@ a.legal { #body-login .warning-messsage { width: 50%; } + .banner-content-why-murena{ + margin: 5% 0 5% 0; + } } @media only screen and (max-width: 640px) { .wrapper{ -- GitLab From a2d0af7c499256e2db24008de9261707a9efde41 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 12:12:41 +0530 Subject: [PATCH 06/25] indent --- core/css/guest.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 7af06b20..b5505b7c 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1441,7 +1441,7 @@ a.legal { #body-login .v-align{ height: 60%; overflow: hidden; - width: 70%; + width: 70%; } .banner-right-align { -webkit-box-ordinal-group: 2; @@ -1455,7 +1455,7 @@ a.legal { text-align: center; } .banner-content-create-button a{ - width: 90%; + width: 90%; } .v-align { -webkit-box-ordinal-group: 1; @@ -1500,7 +1500,7 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; - height: 80%; + height: 80%; } .banner-content-get-free-murena{ font-size: 18px; @@ -1522,7 +1522,7 @@ a.legal { .v-align { width: 100%; margin: 0 auto; - height: 100%; + height: 100%; } .banner-right-align{ display: none; -- GitLab From 1600b537ec38ed095694e511c595cd4dcda9cca6 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 12:14:23 +0530 Subject: [PATCH 07/25] indent #1 --- core/css/guest.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index b5505b7c..ce68be2f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1072,7 +1072,7 @@ footer { right: 5%; bottom: 0; padding-bottom: 15px; - max-width: 350px; + max-width: 350px; } footer .info .entity-name { @@ -1333,7 +1333,7 @@ a.legal { font-style: normal; color: #FFFFFF; text-align: left; - max-width: 60%; + max-width: 60%; } .banner-content-get-free-murena { @@ -1435,7 +1435,7 @@ a.legal { } } @media only screen and (max-width: 1050px) { - .banner-content{ + .banner-content{ max-width: 80%; } #body-login .v-align{ @@ -1456,7 +1456,7 @@ a.legal { } .banner-content-create-button a{ width: 90%; - } + } .v-align { -webkit-box-ordinal-group: 1; -moz-box-ordinal-group: 1; -- GitLab From 1e4f1923f9ba43ac07dfff062610ec6f153bb971 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 12:15:44 +0530 Subject: [PATCH 08/25] indent #2 --- core/css/guest.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index ce68be2f..f81565fd 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1487,9 +1487,9 @@ a.legal { #body-login .warning-messsage { width: 50%; } - .banner-content-why-murena{ + .banner-content-why-murena{ margin: 5% 0 5% 0; - } + } } @media only screen and (max-width: 640px) { .wrapper{ @@ -1502,9 +1502,9 @@ a.legal { position: unset !important; height: 80%; } - .banner-content-get-free-murena{ + .banner-content-get-free-murena{ font-size: 18px; - } + } .banner-right-align{ height: 50%; } -- GitLab From 22d4290c736dadf0e96782a334cd0375b580d9d9 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 14:38:50 +0530 Subject: [PATCH 09/25] css animation added on footer links --- core/css/guest.css | 10 ++++++++++ core/js/login.js | 2 ++ 2 files changed, 12 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index f81565fd..a986db04 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1073,6 +1073,7 @@ footer { bottom: 0; padding-bottom: 15px; max-width: 350px; + transition: all 0.3s linear; } footer .info .entity-name { @@ -1435,6 +1436,10 @@ a.legal { } } @media only screen and (max-width: 1050px) { + .width0{ + width: 0 !important; + height: 0 !important; + } .banner-content{ max-width: 80%; } @@ -1537,3 +1542,8 @@ a.legal { .pos-relative{ position: relative; } +.forgotpass-footer { + margin: 0 auto; + position: unset; + transition: all 0.3s linear; +} diff --git a/core/js/login.js b/core/js/login.js index 99397a7b..d9fd3b99 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -3,10 +3,12 @@ $(document).on('click','#lost-password', function(){ $('.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'); + $('footer').removeClass('forgotpass-footer'); $('.lines').show('slow'); $('.banner-content').show('slow'); }); -- GitLab From 6efe9b093d28471a7110934aed5b80edd2da09b5 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 14:48:53 +0530 Subject: [PATCH 10/25] added condition for big screen for js --- core/js/login.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/core/js/login.js b/core/js/login.js index d9fd3b99..ebcfdf5a 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,14 +1,18 @@ $(document).on('click','#lost-password', function(){ - $('.banner-content').hide('slow'); - $('.banner-right-align').addClass('width0'); - $('.lines').hide(); - $('.v-align').addClass('warning-messsage'); - $('footer').addClass('forgotpass-footer'); + if(window.innerWidth > 1050){ + $('.banner-content').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'); - $('footer').removeClass('forgotpass-footer'); - $('.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'); + } }); -- GitLab From 0ec15dc5bf7e5ea4c3c6fd3f368e5d3e729b01a7 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 16:31:07 +0530 Subject: [PATCH 11/25] removed displaynone --- core/css/guest.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index a986db04..aa030f98 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1529,9 +1529,6 @@ a.legal { margin: 0 auto; height: 100%; } - .banner-right-align{ - display: none; - } #body-login .warning-messsage { width: 90%; } -- GitLab From 22b752175a346262450b1ed2f1476b73c593197f Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 16:41:24 +0530 Subject: [PATCH 12/25] removed height --- core/css/guest.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index aa030f98..4b2d55da 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1505,7 +1505,6 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; - height: 80%; } .banner-content-get-free-murena{ font-size: 18px; -- GitLab From 6e83cb71ca06e37fe285bc847e996e189dad4e15 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 16:43:22 +0530 Subject: [PATCH 13/25] removed height --- core/css/guest.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 4b2d55da..30c63b6d 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1444,7 +1444,7 @@ a.legal { max-width: 80%; } #body-login .v-align{ - height: 60%; + height: 70%; overflow: hidden; width: 70%; } -- GitLab From 27bff964048f4ae0f34c280dac6a8dbb1247c0b4 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 17:01:33 +0530 Subject: [PATCH 14/25] added create new account option --- core/css/guest.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index 30c63b6d..77edbce5 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1523,6 +1523,9 @@ a.legal { } } @media only screen and (max-width: 360px) { + .banner-right-align{ + display: none; + } .v-align { width: 100%; margin: 0 auto; @@ -1543,3 +1546,11 @@ a.legal { position: unset; transition: all 0.3s linear; } +.have-an-account { + margin-top: 10px; + color: #333333; +} +.have-an-account a{ + color: #0086ff !important; +} + -- GitLab From f46fd865724346fbf129dec240b1df662329b453 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 17:06:57 +0530 Subject: [PATCH 15/25] translations added --- core/l10n/de.js | 4 +++- core/l10n/de.json | 4 +++- core/l10n/en.js | 4 +++- core/l10n/en.json | 4 +++- core/l10n/es.js | 4 +++- core/l10n/es.json | 4 +++- core/l10n/fr.js | 4 +++- core/l10n/fr.json | 4 +++- 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/core/l10n/de.js b/core/l10n/de.js index eca7e889..d95f61de 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", + "Dont 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 10af8cc1..1c35b7ce 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", + "Dont 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 8ad9222c..98f877c8 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", + "Dont 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 2da6ba29..9148a8d1 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", + "Dont 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 1909a336..0d302d63 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", + "Dont have an account yet?": "¿Aun no tiene una cuenta?", + "Create an account": "Crea una cuenta" }, "nplurals=2; plural=(n != 1);"); diff --git a/core/l10n/es.json b/core/l10n/es.json index 708147bb..27f78b98 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", + "Dont have an account yet?": "¿Aun no tiene una cuenta?", + "Create an account": "Crea una cuenta" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 4a54859a..d1874823 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", + "Dont 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 f8ec84aa..0ffdbd7d 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", + "Dont have an account yet?": "Vous n'avez pas encore de compte ?", + "Create an account": "Créer un compte" }, "pluralForm": "nplurals=2; plural=(n != 1);" } -- GitLab From d7fe0c5a50ab61608aefa62260396dbf7182f417 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 17:47:58 +0530 Subject: [PATCH 16/25] responsive issue --- core/css/guest.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 77edbce5..3154f841 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1505,6 +1505,7 @@ a.legal { margin: 0 auto; overflow: hidden; position: unset !important; + height: unset; } .banner-content-get-free-murena{ font-size: 18px; @@ -1522,7 +1523,7 @@ a.legal { width: 80%; } } -@media only screen and (max-width: 360px) { +@media only screen and (max-width: 375px) { .banner-right-align{ display: none; } @@ -1549,6 +1550,9 @@ a.legal { .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; -- GitLab From eaa6f87b0870f8403acf4d41075bf377b63ffd1f Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 18:24:28 +0530 Subject: [PATCH 17/25] warning message style --- core/css/guest.css | 20 +++++++++++--------- core/js/login.js | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 3154f841..0091e2d2 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1124,12 +1124,10 @@ a.legal { transition: all 0.3s linear; } #body-login .warning-messsage { - width: 30%; - margin: 5% auto; - height: 80%; - gap: 0; - overflow: auto; - margin-top: 0%; + width: 50%; + margin: 0 auto; + margin-top: 0; + padding: 0; } #body-login #user, #body-login #password, @@ -1383,6 +1381,9 @@ a.legal { width: 100%; margin-top: 10vh; } +.warning-messsage header{ + margin-top: 0; +} .sign-in-label { font-family: 'Montserrat'; font-style: normal; @@ -1396,6 +1397,10 @@ a.legal { margin: 0 auto; margin-bottom: 15vh; } +.warning-messsage main{ + margin-bottom: 0; + max-width: 90%; +} #lost-password{ color: #0086FF !important; font-family: 'Montserrat'; @@ -1489,9 +1494,6 @@ a.legal { .lines{ width: 30%; } - #body-login .warning-messsage { - width: 50%; - } .banner-content-why-murena{ margin: 5% 0 5% 0; } diff --git a/core/js/login.js b/core/js/login.js index ebcfdf5a..03929d77 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,6 +1,7 @@ $(document).on('click','#lost-password', function(){ 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'); @@ -14,5 +15,6 @@ $(document).on('click','.lost-password-container a', function(){ $('footer').removeClass('forgotpass-footer'); $('.lines').show('slow'); $('.banner-content').show('slow'); + $('.have-an-account').show('slow'); } }); -- GitLab From 197aa8532a4be2d9e5da305f120c73eab60253c7 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 18:33:08 +0530 Subject: [PATCH 18/25] suggestions added --- core/l10n/es.js | 4 ++-- core/l10n/es.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/l10n/es.js b/core/l10n/es.js index 0d302d63..aaa6cc74 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -13,7 +13,7 @@ OC.L10N.register( "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", "Copyright": "Derechos de autor", - "Dont have an account yet?": "¿Aun no tiene una cuenta?", - "Create an account": "Crea una cuenta" + "Dont 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 27f78b98..f4a38b88 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -12,8 +12,8 @@ "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", "Copyright": "Derechos de autor", - "Dont have an account yet?": "¿Aun no tiene una cuenta?", - "Create an account": "Crea una cuenta" + "Dont have an account yet?": "¿Aún no tienes una cuenta?", + "Create an account": "Regístrate!" }, "pluralForm": "nplurals=2; plural=(n != 1);" } -- GitLab From 479fb31d420698b0f356f99e5a7bd806d2ee607f Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 14 Jun 2022 18:46:30 +0530 Subject: [PATCH 19/25] added single quote --- core/l10n/de.js | 2 +- core/l10n/de.json | 2 +- core/l10n/en.js | 2 +- core/l10n/en.json | 2 +- core/l10n/es.js | 2 +- core/l10n/es.json | 2 +- core/l10n/fr.js | 2 +- core/l10n/fr.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/l10n/de.js b/core/l10n/de.js index d95f61de..9ff89a01 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -13,7 +13,7 @@ OC.L10N.register( "Privacy Policy": "Privacybeleid", "All Rights Reserved": "Alle rechten voorbehouden", "Copyright": "Auteursrechten", - "Dont have an account yet?": "Heb je nog geen account?", + "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 1c35b7ce..0ad9c981 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -12,7 +12,7 @@ "Privacy Policy": "Privacybeleid", "All Rights Reserved": "Alle rechten voorbehouden", "Copyright": "Auteursrechten", - "Dont have an account yet?": "Heb je nog geen account?", + "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 98f877c8..5292e9b0 100755 --- a/core/l10n/en.js +++ b/core/l10n/en.js @@ -13,7 +13,7 @@ OC.L10N.register( "Privacy Policy": "Privacy Policy", "All Rights Reserved": "All Rights Reserved", "Copyright": "Copyright", - "Dont have an account yet?": "Don't have an account yet?", + "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 9148a8d1..bc29fbc2 100755 --- a/core/l10n/en.json +++ b/core/l10n/en.json @@ -12,7 +12,7 @@ "Privacy Policy": "Privacy Policy", "All Rights Reserved": "All Rights Reserved", "Copyright": "Copyright", - "Dont have an account yet?": "Don't have an account yet?", + "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 aaa6cc74..e188605a 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -13,7 +13,7 @@ OC.L10N.register( "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", "Copyright": "Derechos de autor", - "Dont have an account yet?": "¿Aún no tienes una cuenta?", + "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 f4a38b88..0fbc88d5 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -12,7 +12,7 @@ "Privacy Policy": "Política de privacidad", "All Rights Reserved": "Reservados todos los derechos", "Copyright": "Derechos de autor", - "Dont have an account yet?": "¿Aún no tienes una cuenta?", + "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 d1874823..8295ab6e 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -13,7 +13,7 @@ OC.L10N.register( "Privacy Policy": "Politique de confidentialité", "All Rights Reserved": "Tous les droits sont réservés", "Copyright": "droits d'auteur", - "Dont have an account yet?": "Vous n'avez pas encore de compte ?", + "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 0ffdbd7d..a36cbe83 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -12,7 +12,7 @@ "Privacy Policy": "Politique de confidentialité", "All Rights Reserved": "Tous les droits sont réservés", "Copyright": "droits d'auteur", - "Dont have an account yet?": "Vous n'avez pas encore de compte ?", + "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);" -- GitLab From 4810b8c721701ae81abbf93d881d4d0f559ae000 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 17:49:33 +0530 Subject: [PATCH 20/25] footer issue --- core/css/guest.css | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 0091e2d2..fd60ba1c 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1068,12 +1068,9 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- /* FOOTER */ footer { background-color: #ffffff; - position: absolute; - right: 5%; - bottom: 0; - padding-bottom: 15px; - max-width: 350px; + width: 100%; transition: all 0.3s linear; + padding-bottom: 20px; } footer .info .entity-name { @@ -1379,7 +1376,6 @@ a.legal { } .v-align header{ width: 100%; - margin-top: 10vh; } .warning-messsage header{ margin-top: 0; @@ -1395,7 +1391,6 @@ a.legal { .v-align main{ width: 100%; margin: 0 auto; - margin-bottom: 15vh; } .warning-messsage main{ margin-bottom: 0; @@ -1435,12 +1430,24 @@ a.legal { .pos-fixed{ position: fixed !important; } +#body-login > .wrapper > footer{ + display: none; +} +.v-align > footer{ + display: block; +} @media only screen and (max-width: 1440px) { .banner-right-align { width: 65%; } } @media only screen and (max-width: 1050px) { + .v-align footer{ + display: none; + } + #body-login > .wrapper > footer{ + display: block; + } .width0{ width: 0 !important; height: 0 !important; @@ -1449,9 +1456,9 @@ a.legal { max-width: 80%; } #body-login .v-align{ - height: 70%; overflow: hidden; width: 70%; + height: auto; } .banner-right-align { -webkit-box-ordinal-group: 2; @@ -1460,6 +1467,7 @@ a.legal { width: 100%; height: 60%; position: relative; + clear: both; } .banner-content-create-button{ text-align: center; @@ -1559,4 +1567,3 @@ a.legal { .have-an-account a{ color: #0086ff !important; } - -- GitLab From 9acfcc5dfc5f7327d0652d253a5e3e32be58cfa2 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 17:58:42 +0530 Subject: [PATCH 21/25] media queires --- core/css/guest.css | 6 +++++- core/css/server.css | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index fd60ba1c..c2b9d970 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1394,7 +1394,7 @@ a.legal { } .warning-messsage main{ margin-bottom: 0; - max-width: 90%; + max-width: 60%; } #lost-password{ color: #0086FF !important; @@ -1435,6 +1435,7 @@ a.legal { } .v-align > footer{ display: block; + margin-top: 30px; } @media only screen and (max-width: 1440px) { .banner-right-align { @@ -1532,6 +1533,9 @@ a.legal { #body-login .warning-messsage { width: 80%; } + .warning-messsage main{ + max-width: 90%; + } } @media only screen and (max-width: 375px) { .banner-right-align{ diff --git a/core/css/server.css b/core/css/server.css index bceb8b9f..f55145c0 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1716,9 +1716,6 @@ button#quotaincreasebutton { margin-top: 15px !important; } - .warning-messsage footer { - position: fixed; - } @media only screen and (max-width: 640px) { .new-icons .color-icons { height: 50px; -- GitLab From 279a0fe50162b5efbe7f3824559b6964e3f6b66d Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 17:59:14 +0530 Subject: [PATCH 22/25] media queires --- core/css/guest.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index c2b9d970..cdbb3421 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1070,7 +1070,7 @@ footer { background-color: #ffffff; width: 100%; transition: all 0.3s linear; - padding-bottom: 20px; + padding-bottom: 20px; } footer .info .entity-name { @@ -1124,7 +1124,7 @@ a.legal { width: 50%; margin: 0 auto; margin-top: 0; - padding: 0; + padding: 0; } #body-login #user, #body-login #password, @@ -1435,7 +1435,7 @@ a.legal { } .v-align > footer{ display: block; - margin-top: 30px; + margin-top: 30px; } @media only screen and (max-width: 1440px) { .banner-right-align { @@ -1533,9 +1533,9 @@ a.legal { #body-login .warning-messsage { width: 80%; } - .warning-messsage main{ - max-width: 90%; - } + .warning-messsage main{ + max-width: 90%; + } } @media only screen and (max-width: 375px) { .banner-right-align{ -- GitLab From 20f53ff184729596eeb6f53fd149e99e19127527 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 18:42:16 +0530 Subject: [PATCH 23/25] warning message css --- core/css/guest.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index 60ce79c2..ab2f2da4 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1514,6 +1514,10 @@ a.legal { .banner-content-why-murena{ margin: 5% 0 5% 0; } + .warning-messsage main{ + max-width: 90%; + overflow-x: auto; + } } @media only screen and (max-width: 640px) { .wrapper{ -- GitLab From 327d520004d5068a023eae92495073a7fe52a168 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 19:07:00 +0530 Subject: [PATCH 24/25] added height to keep footer away from login section --- core/css/guest.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index ab2f2da4..a0acb2fc 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1394,7 +1394,6 @@ a.legal { .v-align main{ width: 100%; margin: 0 auto; - margin-bottom: 15vh; } .warning-messsage main{ margin-bottom: 0; @@ -1583,3 +1582,6 @@ a.legal { .have-an-account a{ color: #0086ff !important; } +.v-align > footer p.info { + height: 40%; +} -- GitLab From f683a017f4a68fdd133bc9f0c1fba8f0c24e8da8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 16 Jun 2022 19:20:52 +0530 Subject: [PATCH 25/25] added break after copyright --- defaults.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.php b/defaults.php index 08beeca1..a43ac7ea 100644 --- a/defaults.php +++ b/defaults.php @@ -115,7 +115,7 @@ class OC_Theme { * @return string long footer */ public function getLongFooter() { - $footer = '

'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'. '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.

' ; + $footer = '

'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'.

'.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.

' ; $footer .= '

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

'; -- GitLab