From 72f9e19ebb08f397760b44587f802039a81cfe16 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 19:52:36 +0530 Subject: [PATCH 01/12] email icon align fix --- styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/styles.css b/styles.css index 75933d5..5cb20ed 100644 --- a/styles.css +++ b/styles.css @@ -3198,4 +3198,10 @@ html.rl-mobile .hide-mobile[data-i18n="GLOBAL/SAVE"] { text-align: right; color: var(--color-text-light); } +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title, +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title::before +{ + line-height: 27px; + height: 27px; +} -- GitLab From 18329aca15235fcce97b658400a9c777f7f3f7ce Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 20:10:22 +0530 Subject: [PATCH 02/12] icon fixes --- images/hide-my-email.svg | 4 ++-- images/logout.svg | 4 ++-- images/mobile.svg | 4 ++-- images/plus.svg | 4 ++-- images/profiletick.svg | 4 ++-- images/setting.svg | 4 ++-- styles.css | 19 ++++++++++++++++++- 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/images/hide-my-email.svg b/images/hide-my-email.svg index c778c5b..9a49393 100644 --- a/images/hide-my-email.svg +++ b/images/hide-my-email.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/logout.svg b/images/logout.svg index f769d88..39a6c31 100644 --- a/images/logout.svg +++ b/images/logout.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/mobile.svg b/images/mobile.svg index 0286462..8e28a60 100644 --- a/images/mobile.svg +++ b/images/mobile.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/plus.svg b/images/plus.svg index 3f9a3a9..111cf48 100644 --- a/images/plus.svg +++ b/images/plus.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/profiletick.svg b/images/profiletick.svg index 2c0ba03..d13f9ab 100644 --- a/images/profiletick.svg +++ b/images/profiletick.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/setting.svg b/images/setting.svg index 6d5562d..9a49393 100644 --- a/images/setting.svg +++ b/images/setting.svg @@ -1,3 +1,3 @@ - - + + diff --git a/styles.css b/styles.css index 5cb20ed..3605c77 100644 --- a/styles.css +++ b/styles.css @@ -2101,7 +2101,24 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar width:20px; color:transparent; } - +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TITLES/SETTINGS"]::before { + content: ""; + background-image: url('images/setting.svg'); + background-position: center center; + background-repeat: no-repeat; + height:20px; + width:20px; + color:transparent; +} +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/HELP"]::before { + content: ""; + background-image: url('images/help.svg'); + background-position: center center; + background-repeat: no-repeat; + height:20px; + width:20px; + color:transparent; +} #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TOP_TOOLBAR/BUTTON_HELP"]::before { content: ""; background-image: url('images/help.svg'); -- GitLab From 631fe21599328d1b5f297b83bd062a504083a58e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 20:17:04 +0530 Subject: [PATCH 03/12] icon fixes --- images/setting.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/setting.svg b/images/setting.svg index 9a49393..dde8721 100644 --- a/images/setting.svg +++ b/images/setting.svg @@ -1,3 +1,3 @@ - + -- GitLab From af6ecd79f89e533fd9a172dec59896f894432c1b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 20:38:07 +0530 Subject: [PATCH 04/12] icon fixes --- styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles.css b/styles.css index 3605c77..47876cd 100644 --- a/styles.css +++ b/styles.css @@ -2065,6 +2065,9 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar width:20px; color:transparent; } +#rl-app #rl-right #V-SystemDropDown a[data-unread]::after { + display:none; +} #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show .dividerbar a[data-i18n="TOP_TOOLBAR/BUTTON_ADD_ACCOUNT"]::before { content: ""; background-image: url('images/plus.svg'); -- GitLab From 47296d590415bb0f062fd653f23ae19648a0cb0b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 20:41:46 +0530 Subject: [PATCH 05/12] icon fixes --- styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/styles.css b/styles.css index 47876cd..924f39e 100644 --- a/styles.css +++ b/styles.css @@ -2064,6 +2064,12 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar height:20px; width:20px; color:transparent; + width: 20px; + visibility: visible; +} +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title::before{ + width: 20px; + visibility: hidden; } #rl-app #rl-right #V-SystemDropDown a[data-unread]::after { display:none; -- GitLab From 05198587e16cf32e522a392fa866d6246516ab03 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 20:53:32 +0530 Subject: [PATCH 06/12] icon fixes --- styles.css | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/styles.css b/styles.css index 924f39e..7c42662 100644 --- a/styles.css +++ b/styles.css @@ -1677,8 +1677,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar #rl-app .dropdown-menu a { background-color: unset; color: unset; - height: 22px; - line-height: 22px; + height: 24px; + line-height: 24px; border-radius: 3px; margin: 2px; box-sizing: content-box; @@ -2061,14 +2061,13 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/profiletick.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; - width: 20px; visibility: visible; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title::before{ - width: 20px; + width: 24x; visibility: hidden; } #rl-app #rl-right #V-SystemDropDown a[data-unread]::after { @@ -2079,8 +2078,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/plus.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/CONTACTS"]::before { @@ -2088,8 +2087,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/contactsmall.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="HIDE_MY_EMAIL/TAB_NAME"]::before { @@ -2097,8 +2096,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/hide-my-email.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"]::before { @@ -2106,8 +2105,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/setting.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TITLES/SETTINGS"]::before { @@ -2115,8 +2114,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/setting.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/HELP"]::before { @@ -2124,8 +2123,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/help.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TOP_TOOLBAR/BUTTON_HELP"]::before { @@ -2133,8 +2132,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/help.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="MOBILE/BUTTON_MOBILE_VERSION"]::before { @@ -2142,8 +2141,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('images/mobile.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li:has(a[data-i18n="GLOBAL/LOGOUT"]){ -- GitLab From 3dd4b79dbfb71d365723fbd2608b3deadaac942e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 2 Feb 2023 21:02:16 +0530 Subject: [PATCH 07/12] icon fixes --- styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles.css b/styles.css index 7c42662..bf7d6cb 100644 --- a/styles.css +++ b/styles.css @@ -2067,7 +2067,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar visibility: visible; } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title::before{ - width: 24x; + width: 24px; visibility: hidden; } #rl-app #rl-right #V-SystemDropDown a[data-unread]::after { -- GitLab From 0b23ec55d4078b1bfc3dc58f9f015aeaa513f216 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 3 Feb 2023 15:07:45 +0530 Subject: [PATCH 08/12] reply thred fix --- styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/styles.css b/styles.css index bf7d6cb..e9aa1e7 100644 --- a/styles.css +++ b/styles.css @@ -1338,6 +1338,7 @@ html:not(rl-mobile) #rl-app .hideMessageListCheckbox .checkboxCheckAll { } #rl-app .messageListItem{ border-bottom: 1px solid var(--color-border-grey); + position:relative; } #rl-app .messageListItem:hover, #rl-app .messageListItem.focused:hover { -- GitLab From 7a78809a61468182dc6f2135fd944fcd13df87d8 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Mon, 6 Feb 2023 20:33:59 +0530 Subject: [PATCH 09/12] update images path --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index ceda042..f813d42 100644 --- a/style.css +++ b/style.css @@ -2112,7 +2112,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="TITLES/SETTINGS"]::before { content: ""; - background-image: url('images/setting.svg'); + background-image: url('/themes/Murena/snappymail/images/setting.svg'); background-position: center center; background-repeat: no-repeat; height:24px; @@ -2121,7 +2121,7 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar } #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/HELP"]::before { content: ""; - background-image: url('images/help.svg'); + background-image: url('/themes/Murena/snappymail/images/help.svg'); background-position: center center; background-repeat: no-repeat; height:24px; -- GitLab From 1e971b45c99255f1777bc5cd8536165668c8f4b1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Feb 2023 15:47:09 +0530 Subject: [PATCH 10/12] hide logout firefox --- js/snappymail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/snappymail.js b/js/snappymail.js index e724da1..0f253e3 100644 --- a/js/snappymail.js +++ b/js/snappymail.js @@ -14,7 +14,7 @@ document.onreadystatechange = () => { form && SnappyMailFormHelper(form); } }; - +document.querySelector("#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li:has(a[data-i18n='GLOBAL/LOGOUT'])").style.display = "none"; document.addEventListener('DOMContentLoaded', () => { const iframe = document.getElementById('rliframe'); if (!iframe) return; @@ -37,7 +37,7 @@ document.addEventListener('DOMContentLoaded', () => { // Pass nextcloud themes and theme attributes to SnappyMail. function passThemes(iframe) { if (!iframe) return; - + const target = iframe.contentWindow.document; const ncStylesheets = [...document.querySelectorAll('link.theme')]; -- GitLab From bc6f6280c59ccf51d162f9435846d80df4349c2b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Feb 2023 15:55:14 +0530 Subject: [PATCH 11/12] hide logout firefox --- js/snappymail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/snappymail.js b/js/snappymail.js index 0f253e3..239a0ef 100644 --- a/js/snappymail.js +++ b/js/snappymail.js @@ -14,7 +14,7 @@ document.onreadystatechange = () => { form && SnappyMailFormHelper(form); } }; -document.querySelector("#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li:has(a[data-i18n='GLOBAL/LOGOUT'])").style.display = "none"; +document.querySelector("#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n='GLOBAL/LOGOUT']").parentNode.style.display = "none"; document.addEventListener('DOMContentLoaded', () => { const iframe = document.getElementById('rliframe'); if (!iframe) return; -- GitLab From f36ba5b3a1caf2147b97150395c419abc33434ad Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 7 Feb 2023 16:36:59 +0530 Subject: [PATCH 12/12] hide logout firefox --- js/snappymail.js | 2 +- style.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/js/snappymail.js b/js/snappymail.js index 239a0ef..8f5fdbc 100644 --- a/js/snappymail.js +++ b/js/snappymail.js @@ -14,7 +14,7 @@ document.onreadystatechange = () => { form && SnappyMailFormHelper(form); } }; -document.querySelector("#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n='GLOBAL/LOGOUT']").parentNode.style.display = "none"; + document.addEventListener('DOMContentLoaded', () => { const iframe = document.getElementById('rliframe'); if (!iframe) return; diff --git a/style.css b/style.css index f813d42..8f44b11 100644 --- a/style.css +++ b/style.css @@ -2149,6 +2149,9 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar #rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li:has(a[data-i18n="GLOBAL/LOGOUT"]){ display:none; } +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/LOGOUT"] { + display:none; + } #rl-app dialog > header, #rl-app dialog > footer, #rl-app .squire-toolbar { -- GitLab