From 298c06c5f87b1a25dc561d09a980fe6051295884 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 15:32:17 +0530 Subject: [PATCH 1/8] fix header zindex --- src/email-recovery.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/email-recovery.js b/src/email-recovery.js index 3606498..b14d35e 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -98,6 +98,7 @@ function setTopStyle(selector, topValue) { const element = document.querySelector(selector) if (element) { element.style.top = topValue + element.style.zIndex = '1' } } -- GitLab From 3ee20154874b3d18faaaa0b4184bd7c7f1c6d35f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 16:31:01 +0530 Subject: [PATCH 2/8] zindex-0 --- src/email-recovery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index b14d35e..f6f8ae5 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -98,7 +98,7 @@ function setTopStyle(selector, topValue) { const element = document.querySelector(selector) if (element) { element.style.top = topValue - element.style.zIndex = '1' + element.style.zIndex = '0' } } -- GitLab From c040230121848e8174ab5e6d30b75be687e96c87 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 16:59:40 +0530 Subject: [PATCH 3/8] zindex-0 only for password --- src/email-recovery.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index f6f8ae5..bd3efa7 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -98,7 +98,9 @@ function setTopStyle(selector, topValue) { const element = document.querySelector(selector) if (element) { element.style.top = topValue - element.style.zIndex = '0' + if(window.location.href.includes('apps/passwords/')) { + element.style.zIndex = '0' + } } } -- GitLab From d06d3f97e4de83dd4706e851417de999486887ed Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 17:15:47 +0530 Subject: [PATCH 4/8] zindex-0 only for password --- src/email-recovery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index bd3efa7..fed1cf9 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -98,9 +98,9 @@ function setTopStyle(selector, topValue) { const element = document.querySelector(selector) if (element) { element.style.top = topValue - if(window.location.href.includes('apps/passwords/')) { + if (window.location.href.includes('apps/passwords/')) { element.style.zIndex = '0' - } + } } } -- GitLab From 0a8da3e9eef55327c759aaa061a1de3f1a933237 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 19:05:47 +0530 Subject: [PATCH 5/8] set position absolute for popup password --- src/email-recovery.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index fed1cf9..6c3b35d 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -99,7 +99,10 @@ function setTopStyle(selector, topValue) { if (element) { element.style.top = topValue if (window.location.href.includes('apps/passwords/')) { - element.style.zIndex = '0' + const dialogElement = document.querySelector('#passwords-edit-dialog') + if (dialogElement) { + dialogElement.style.position = 'absolute' + } } } } -- GitLab From e812b0e111b7b2a9751f0badc8c32b8c8c484644 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 20:24:46 +0530 Subject: [PATCH 6/8] move it inside content vue --- src/email-recovery.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index 6c3b35d..28c24dd 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -33,6 +33,12 @@ document.addEventListener('DOMContentLoaded', function() { const contentVue = document.querySelector('#content-vue') if (contentVue) { setMarginTopAndHeight('#content-vue', topHeight) + if (window.location.href.includes('apps/passwords/')) { + const dialogElement = document.querySelector('#passwords-edit-dialog') + if (dialogElement) { + dialogElement.style.position = 'absolute' + } + } clearInterval(intervalId) } }, 100) @@ -98,12 +104,6 @@ function setTopStyle(selector, topValue) { const element = document.querySelector(selector) if (element) { element.style.top = topValue - if (window.location.href.includes('apps/passwords/')) { - const dialogElement = document.querySelector('#passwords-edit-dialog') - if (dialogElement) { - dialogElement.style.position = 'absolute' - } - } } } -- GitLab From e968718058ba8e44e4432534d754922690355e50 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 18 Oct 2024 21:18:05 +0530 Subject: [PATCH 7/8] made content vue relative --- src/email-recovery.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index 28c24dd..dfb7364 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -33,12 +33,6 @@ document.addEventListener('DOMContentLoaded', function() { const contentVue = document.querySelector('#content-vue') if (contentVue) { setMarginTopAndHeight('#content-vue', topHeight) - if (window.location.href.includes('apps/passwords/')) { - const dialogElement = document.querySelector('#passwords-edit-dialog') - if (dialogElement) { - dialogElement.style.position = 'absolute' - } - } clearInterval(intervalId) } }, 100) @@ -125,6 +119,9 @@ function setMarginTopAndHeight(selector, topValue) { element.style.cssText += `margin-top: ${topValue} !important;` const heightValue = `calc(100% - env(safe-area-inset-bottom) - ${topValue} - var(--body-container-margin)) !important` element.style.cssText += `height: ${heightValue};` + if (window.location.href.includes('apps/passwords/')) { + element.style.cssText += 'position:relative;' + } } } /** -- GitLab From 09dc400cd30034c815965cd0c533057698679c5e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 21 Oct 2024 11:45:20 +0530 Subject: [PATCH 8/8] version bump --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 368bc4a..90788aa 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ Email Recovery Email Recovery App - 9.0.0 + 9.0.1 agpl MURENA SAS EmailRecovery -- GitLab