From 79a0c1f99ca2c82a0f59786929a42f10d3fb166d Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 12:41:48 +0530 Subject: [PATCH 01/14] login responsive issue --- core/css/guest.css | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index a70f1bbe..2e1a9921 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1066,10 +1066,12 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- footer { height: 70px; width: 100%; - position: absolute; + /* position: absolute; */ bottom: 0; right: 0; padding-bottom: 15px; + background-color: #ffffff; + margin-top: 15%; } footer .info .entity-name { @@ -1106,16 +1108,16 @@ a.legal { flex-direction: column; justify-content: center; align-items: flex-start; - gap: 40px; - height: 100%; + height: auto; background-color: #FFFFFF; flex: none; order: 0; align-self: stretch; flex-grow: 0; box-sizing: border-box; - padding: 64px 44px; + padding: 15vh 5vh; position: relative; + overflow: auto; } #body-login .warning-messsage { width: 30%; @@ -1371,6 +1373,7 @@ a.legal { } .v-align header{ width: 100%; + margin-bottom: 10%; } .sign-in-label { font-family: 'Montserrat'; @@ -1430,6 +1433,7 @@ a.legal { @media only screen and (max-width: 1050px) { #body-login .v-align{ height: 80%; + overflow: hidden; } .banner-right-align { -webkit-box-ordinal-group: 2; @@ -1437,8 +1441,11 @@ a.legal { box-ordinal-group: 2; width: 100%; position: relative; - height: 70%; + height: 80%; } + .banner-content-create-button{ + text-align: center; + } .v-align { -webkit-box-ordinal-group: 1; @@ -1456,7 +1463,9 @@ a.legal { box-orient: vertical; } footer{ - bottom: -100%; + bottom: 0; + position: fixed; + height: auto; } .lines{ width: 30%; @@ -1470,17 +1479,16 @@ a.legal { position: relative; } #body-login .v-align{ - width: 90%; + width: 100%; margin: 0 auto; + overflow: hidden; position: unset !important; } .banner-right-align{ - height: 50%; + height: 60%; } .banner-right-align .banner-content{ margin-left: 10%; - -ms-transform: translateY(5%); - transform: translateY(5%); } .banner-content-get-free-murena{ font-size: 18px; @@ -1490,7 +1498,9 @@ a.legal { margin: 10% 0 10% 0; } footer{ - bottom: -40%; + bottom: 0; + position: fixed; + height: auto; } .lines{ display: none; @@ -1508,7 +1518,9 @@ a.legal { display: none; } footer { - bottom: 0; + bottom: 0; + position: fixed; + height: auto; } #body-login .warning-messsage { width: 90%; -- GitLab From f712410bb348767f39a8adbf047d21cdd6dbac74 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 13:40:39 +0530 Subject: [PATCH 02/14] added login page js --- core/js/login.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/js/login.js diff --git a/core/js/login.js b/core/js/login.js new file mode 100644 index 00000000..d38532d5 --- /dev/null +++ b/core/js/login.js @@ -0,0 +1,12 @@ +$(document).on('click','#lost-password', function(){ + $('.banner-right-align').hide(500); + $('.v-align').addClass('warning-messsage'); + $(".v-align").fadeOut('fast').delay(300).fadeIn('500'); + $('.fp-label').fadeIn(); $('.sign-label').fadeOut('fast'); +}); +$(document).on('click','.lost-password-container a', function(){ + $('.banner-right-align').show(500); + $('.v-align').removeClass('warning-messsage'); + $(".v-align").fadeOut('fast').delay(300).fadeIn('500'); + $('.fp-label').fadeOut('fast'); $('.sign-label').fadeIn(); +}); -- GitLab From f30fb753842acda8a75f3cd0583a6a85f3c223bc Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 14:03:07 +0530 Subject: [PATCH 03/14] removed comment --- core/css/guest.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 2e1a9921..4ebfb391 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1066,7 +1066,6 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- footer { height: 70px; width: 100%; - /* position: absolute; */ bottom: 0; right: 0; padding-bottom: 15px; -- GitLab From cbd0ebc48954bd70566fe0947a8df67c08a99b0d Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 19:28:17 +0530 Subject: [PATCH 04/14] added background-color in password input --- core/css/guest.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 4ebfb391..3dd902f0 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -96,6 +96,9 @@ body { color: #808080; } +#body-login .toggle-password { + background-color: #ffffff; +} #body-login .wrapper .update.two-factor a, #body-login .wrapper .update.two-factor h3, @@ -1117,6 +1120,7 @@ a.legal { padding: 15vh 5vh; position: relative; overflow: auto; + max-height: 100%; } #body-login .warning-messsage { width: 30%; @@ -1372,7 +1376,7 @@ a.legal { } .v-align header{ width: 100%; - margin-bottom: 10%; + margin-bottom: 5%; } .sign-in-label { font-family: 'Montserrat'; @@ -1440,7 +1444,7 @@ a.legal { box-ordinal-group: 2; width: 100%; position: relative; - height: 80%; + height: 90%; } .banner-content-create-button{ text-align: center; @@ -1488,6 +1492,7 @@ a.legal { } .banner-right-align .banner-content{ margin-left: 10%; + margin-top: -25%; } .banner-content-get-free-murena{ font-size: 18px; -- GitLab From ebfaec28ff90495db9ef592c40a74a107cbf6bca Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 20:00:52 +0530 Subject: [PATCH 05/14] indent issue --- core/css/guest.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 3dd902f0..ca4d31ae 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1069,11 +1069,11 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- footer { height: 70px; width: 100%; + background-color: #ffffff; + margin-top: 15%; bottom: 0; right: 0; padding-bottom: 15px; - background-color: #ffffff; - margin-top: 15%; } footer .info .entity-name { -- GitLab From b9ab3873f1ca2965e8d2425f16e6b89bc20feb48 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 20:01:39 +0530 Subject: [PATCH 06/14] indent issue #1 --- core/css/guest.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index ca4d31ae..e8cffacd 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1069,8 +1069,8 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- footer { height: 70px; width: 100%; - background-color: #ffffff; - margin-top: 15%; + background-color: #ffffff; + margin-top: 15%; bottom: 0; right: 0; padding-bottom: 15px; -- GitLab From 444c98fa45b149124206a0ea34e0e74f7fe0be88 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 20:04:25 +0530 Subject: [PATCH 07/14] indent issue #2 --- core/css/guest.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index e8cffacd..c54a85d6 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1119,7 +1119,7 @@ a.legal { box-sizing: border-box; padding: 15vh 5vh; position: relative; - overflow: auto; + overflow: auto; max-height: 100%; } #body-login .warning-messsage { @@ -1492,25 +1492,25 @@ a.legal { } .banner-right-align .banner-content{ margin-left: 10%; - margin-top: -25%; + margin-top: -25%; } .banner-content-get-free-murena{ font-size: 18px; } .banner-content-why-murena{ font-size: 14px; - margin: 10% 0 10% 0; + margin: 10% 0 10% 0; } footer{ - bottom: 0; - position: fixed; - height: auto; + bottom: 0; + position: fixed; + height: auto; } .lines{ - display: none; + display: none; } #body-login .warning-messsage { - width: 80%; + width: 80%; } } @media only screen and (max-width: 360px) { @@ -1522,11 +1522,11 @@ a.legal { display: none; } footer { - bottom: 0; - position: fixed; - height: auto; + bottom: 0; + position: fixed; + height: auto; } #body-login .warning-messsage { - width: 90%; + width: 90%; } } -- GitLab From dee22cc05be8e6ac4e9405ed4217889a6922a83b Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 20:05:23 +0530 Subject: [PATCH 08/14] indent issue #3 --- core/css/guest.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index c54a85d6..77c38a6c 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1435,8 +1435,8 @@ a.legal { } @media only screen and (max-width: 1050px) { #body-login .v-align{ - height: 80%; - overflow: hidden; + height: 80%; + overflow: hidden; } .banner-right-align { -webkit-box-ordinal-group: 2; @@ -1447,7 +1447,7 @@ a.legal { height: 90%; } .banner-content-create-button{ - text-align: center; + text-align: center; } .v-align { -- GitLab From fb19e91b940c0db2df510ef200d50b5b52392e9f Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 20:06:55 +0530 Subject: [PATCH 09/14] indent issue #4 --- 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 77c38a6c..c4da485f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1506,12 +1506,12 @@ a.legal { position: fixed; height: auto; } - .lines{ + .lines{ display: none; } - #body-login .warning-messsage { + #body-login .warning-messsage { width: 80%; - } + } } @media only screen and (max-width: 360px) { .v-align { @@ -1526,7 +1526,7 @@ a.legal { position: fixed; height: auto; } - #body-login .warning-messsage { + #body-login .warning-messsage { width: 90%; } } -- GitLab From 7423a07c349574c62ec909b9369ae7300d3a6808 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 21:06:58 +0530 Subject: [PATCH 10/14] change in login js --- core/css/guest.css | 6 ++++++ core/js/login.js | 10 ++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index c4da485f..11a2fec6 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1121,12 +1121,14 @@ a.legal { position: relative; overflow: auto; max-height: 100%; + transition: 1s; } #body-login .warning-messsage { width: 30%; margin: 5% auto; height: auto; gap: 0; + overflow: hidden; } #body-login #user, #body-login #password, @@ -1314,6 +1316,7 @@ a.legal { float: left; width: 70%; background: linear-gradient(127.57deg, #FF7A00 3.94%, #ED1C61 76.89%); + transition: 1s; } .lines{ background-image: url(../img/lines.png); @@ -1530,3 +1533,6 @@ a.legal { width: 90%; } } +.width0{ + width: 0; +} diff --git a/core/js/login.js b/core/js/login.js index d38532d5..b0d47181 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,12 +1,10 @@ $(document).on('click','#lost-password', function(){ - $('.banner-right-align').hide(500); + $('.banner-right-align').addClass('width0'); + $('.lines').hide(); $('.v-align').addClass('warning-messsage'); - $(".v-align").fadeOut('fast').delay(300).fadeIn('500'); - $('.fp-label').fadeIn(); $('.sign-label').fadeOut('fast'); }); $(document).on('click','.lost-password-container a', function(){ - $('.banner-right-align').show(500); + $('.banner-right-align').removeClass('width0'); + $('.lines').show(); $('.v-align').removeClass('warning-messsage'); - $(".v-align").fadeOut('fast').delay(300).fadeIn('500'); - $('.fp-label').fadeOut('fast'); $('.sign-label').fadeIn(); }); -- GitLab From 5d4cc66dbd320aab027cee1d8b343fb576bed69b Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 21:14:36 +0530 Subject: [PATCH 11/14] indent solution --- core/css/guest.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 11a2fec6..68d42dde 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -621,7 +621,7 @@ form .warning input[type='checkbox'] + label { width: 100px; display: block; margin: 0 auto; - background-color: gray; + background-color: gray; border-radius: 10px; } @@ -1141,7 +1141,7 @@ a.legal { border-radius: 8px; margin: 12px 0px; font-size: 16px; - background-color: #ffffff; + background-color: #ffffff; } #body-login .groupbottom, @@ -1164,7 +1164,7 @@ a.legal { #body-login #submit-form, #body-login #reset-password-submit, #body-login .two-factor-submit { - color: white; + color: white; border: none; justify-content: center; align-items: center; @@ -1293,7 +1293,7 @@ a.legal { #body-login #header .logo { background-image: url("../img/logo@2x.svg"); margin-top: 0.5em; - background-size: contain; + background-size: contain; } #body-login .lost-password-container .update { @@ -1307,7 +1307,7 @@ a.legal { opacity: 0.9; } .banner-right-align { - text-align: left; + text-align: left; display: flex; align-items: center; height: 100%; @@ -1316,7 +1316,7 @@ a.legal { float: left; width: 70%; background: linear-gradient(127.57deg, #FF7A00 3.94%, #ED1C61 76.89%); - transition: 1s; + transition: 1s; } .lines{ background-image: url(../img/lines.png); @@ -1329,7 +1329,7 @@ a.legal { width: 20%; } .banner-content { - font-family: 'Montserrat'; + font-family: 'Montserrat'; font-style: normal; color: #FFFFFF; text-align: left; @@ -1379,7 +1379,7 @@ a.legal { } .v-align header{ width: 100%; - margin-bottom: 5%; + margin-bottom: 5%; } .sign-in-label { font-family: 'Montserrat'; @@ -1429,7 +1429,7 @@ a.legal { position: fixed !important; } .banner-content-get-free-murena p{ - width: 75%; + width: 75%; } @media only screen and (max-width: 1440px) { .banner-right-align { @@ -1437,10 +1437,10 @@ a.legal { } } @media only screen and (max-width: 1050px) { - #body-login .v-align{ + #body-login .v-align{ height: 80%; overflow: hidden; - } + } .banner-right-align { -webkit-box-ordinal-group: 2; -moz-box-ordinal-group: 2; @@ -1449,9 +1449,9 @@ a.legal { position: relative; height: 90%; } - .banner-content-create-button{ + .banner-content-create-button{ text-align: center; - } + } .v-align { -webkit-box-ordinal-group: 1; @@ -1469,7 +1469,7 @@ a.legal { box-orient: vertical; } footer{ - bottom: 0; + bottom: 0; position: fixed; height: auto; } -- GitLab From 9e32d90bf6739c19f66e64937cc0409c12dd72ba Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 9 Jun 2022 21:15:21 +0530 Subject: [PATCH 12/14] indent solution --- core/css/guest.css | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 68d42dde..a1f2c82c 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -8,7 +8,7 @@ /* font-weight: 600; */ /* font-style: normal; */ font-display: swap; - letter-spacing: 1px; + letter-spacing: 1px; } /* Mobile font sizes */ @media screen and (max-width: 768px) { @@ -28,7 +28,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'; + font-family: 'Montserrat'; } html { @@ -97,7 +97,7 @@ body { } #body-login .toggle-password { - background-color: #ffffff; + background-color: #ffffff; } #body-login .wrapper .update.two-factor a, @@ -107,7 +107,7 @@ body { color: #808080; } #body-login .wrapper .two-factor-secondary{ - border-color: #808080; + border-color: #808080; text-decoration: underline; } @@ -1470,25 +1470,25 @@ a.legal { } footer{ bottom: 0; - position: fixed; - height: auto; + position: fixed; + height: auto; + } + .lines{ + width: 30%; + } + #body-login .warning-messsage { + width: 50%; } - .lines{ - width: 30%; - } - #body-login .warning-messsage { - width: 50%; - } } @media only screen and (max-width: 640px) { - .wrapper{ - position: relative; - } - #body-login .v-align{ + .wrapper{ + position: relative; + } + #body-login .v-align{ width: 100%; margin: 0 auto; - overflow: hidden; - position: unset !important; + overflow: hidden; + position: unset !important; } .banner-right-align{ height: 60%; @@ -1511,7 +1511,7 @@ a.legal { } .lines{ display: none; - } + } #body-login .warning-messsage { width: 80%; } @@ -1531,8 +1531,8 @@ a.legal { } #body-login .warning-messsage { width: 90%; - } + } } .width0{ - width: 0; + width: 0; } -- GitLab From 14c888ee3073f733ae688c9330255f27696652c0 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 10 Jun 2022 13:24:15 +0530 Subject: [PATCH 13/14] login transition --- core/css/guest.css | 2 +- core/js/login.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index a1f2c82c..d8145886 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1121,7 +1121,7 @@ a.legal { position: relative; overflow: auto; max-height: 100%; - transition: 1s; + transition: all 1s linear; } #body-login .warning-messsage { width: 30%; diff --git a/core/js/login.js b/core/js/login.js index b0d47181..95131f02 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,10 +1,12 @@ $(document).on('click','#lost-password', function(){ + $('.banner-content').hide('fast'); $('.banner-right-align').addClass('width0'); $('.lines').hide(); $('.v-align').addClass('warning-messsage'); }); $(document).on('click','.lost-password-container a', function(){ $('.banner-right-align').removeClass('width0'); - $('.lines').show(); $('.v-align').removeClass('warning-messsage'); + $('.lines').show('slow'); + $('.banner-content').show('slow'); }); -- GitLab From 7e066fc5fd85ae2d6461fe2d65865446d2da6bec Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 10 Jun 2022 14:31:44 +0530 Subject: [PATCH 14/14] login transition --- core/css/guest.css | 2 +- core/js/login.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index d8145886..1c9e82b0 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1121,7 +1121,7 @@ a.legal { position: relative; overflow: auto; max-height: 100%; - transition: all 1s linear; + transition: all 0.3s linear; } #body-login .warning-messsage { width: 30%; diff --git a/core/js/login.js b/core/js/login.js index 95131f02..99397a7b 100644 --- a/core/js/login.js +++ b/core/js/login.js @@ -1,5 +1,5 @@ $(document).on('click','#lost-password', function(){ - $('.banner-content').hide('fast'); + $('.banner-content').hide('slow'); $('.banner-right-align').addClass('width0'); $('.lines').hide(); $('.v-align').addClass('warning-messsage'); -- GitLab