diff --git a/images/hide-my-email.svg b/images/hide-my-email.svg index c778c5ba3620ce87033c9d4a09e6706d32894731..9a49393e2861954fe5217a7c53c1c8b84235e27d 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 f769d88471ecf45b47831ba6abe4f8119bb6735b..39a6c31f89e0354e975f88a219e8a872ad2a56b0 100644 --- a/images/logout.svg +++ b/images/logout.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/mobile.svg b/images/mobile.svg index 0286462cfaac8fa4a794fc1b297c525b0dbae71f..8e28a60925bde871b989da017f1efa6bd016167c 100644 --- a/images/mobile.svg +++ b/images/mobile.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/plus.svg b/images/plus.svg index 3f9a3a95d81560e9c280b33688c7bca6509b2f9b..111cf4824e64eca058bca4020360c2d7eace73a1 100644 --- a/images/plus.svg +++ b/images/plus.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/profiletick.svg b/images/profiletick.svg index 2c0ba0355e685dc36800d17c038427a597b39ec6..d13f9ab893f83717fdbb749113bdc5bab24fea2f 100644 --- a/images/profiletick.svg +++ b/images/profiletick.svg @@ -1,3 +1,3 @@ - - + + diff --git a/images/setting.svg b/images/setting.svg index 6d5562dd2a534236b9e08d2d6da1c77be5281881..dde87215ac4d304c6f8c5932e8c01f8ec82f6734 100644 --- a/images/setting.svg +++ b/images/setting.svg @@ -1,3 +1,3 @@ - - + + diff --git a/js/snappymail.js b/js/snappymail.js index e724da1ed8ba3dde746bcef4655836a878b4f4fc..8f5fdbcf64ce31f99a2f6171da4f6234fdd30644 100644 --- a/js/snappymail.js +++ b/js/snappymail.js @@ -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')]; diff --git a/style.css b/style.css index 6531946b5808fa07a64cc84e1670df94fbfd9bdf..8f44b11e2a2d4baa6af666326d0f8d8afcd93158 100644 --- a/style.css +++ b/style.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 { @@ -1677,8 +1678,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,17 +2062,25 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('/themes/Murena/snappymail/images/profiletick.svg'); background-position: center center; background-repeat: no-repeat; - height:20px; - width:20px; + height:24px; + width:24px; color:transparent; + visibility: visible; +} +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a.email-title::before{ + width: 24px; + visibility: hidden; +} +#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('/themes/Murena/snappymail/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 { @@ -2079,8 +2088,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('/themes/Murena/snappymail/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 { @@ -2088,8 +2097,8 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('/themes/Murena/snappymail/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 { @@ -2097,18 +2106,35 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('/themes/Murena/snappymail/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 { + content: ""; + background-image: url('/themes/Murena/snappymail/images/setting.svg'); + background-position: center center; + background-repeat: no-repeat; + height:24px; + width:24px; + color:transparent; +} +#rl-app #rl-right #V-SystemDropDown .dropdown-menu.right-edge.show li a[data-i18n="GLOBAL/HELP"]::before { + content: ""; + background-image: url('/themes/Murena/snappymail/images/help.svg'); + background-position: center center; + background-repeat: no-repeat; + 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 { content: ""; background-image: url('/themes/Murena/snappymail/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 { @@ -2116,13 +2142,16 @@ html:not(.rl-mobile):not(.rl-no-preview-pane) #rl-app .messageView .top-toolbar background-image: url('/themes/Murena/snappymail/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"]){ 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 { @@ -3198,4 +3227,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; +}