From b2635eb5c6ab6475b7abdc8e72d5f8ce872b41c3 Mon Sep 17 00:00:00 2001 From: djmaze Date: Fri, 5 Nov 2021 11:14:30 +0100 Subject: [PATCH] Cleanup dropmenu css --- dev/Styles/User/Layout.less | 12 +- dev/Styles/User/MessageView.less | 25 ---- dev/Styles/User/SystemDropDown.less | 2 +- dev/View/User/MailBox/MessageView.js | 14 --- .../templates/Views/User/MailMessageList.html | 116 +++++++++--------- .../templates/Views/User/MailMessageView.html | 62 +++++----- .../templates/Views/User/PopupsCompose.html | 36 +++--- .../templates/Views/User/PopupsContacts.html | 41 ++++--- .../templates/Views/User/SystemDropDown.html | 30 ++--- 9 files changed, 149 insertions(+), 189 deletions(-) diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less index 3ae0d1c16..fe4983127 100644 --- a/dev/Styles/User/Layout.less +++ b/dev/Styles/User/Layout.less @@ -78,30 +78,30 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable { width: 5px; } -.g-ui-menu { +.dropdown-menu { max-height: 60vh; max-width: 90vw; overflow: auto; - .e-link { + a { text-decoration: none; cursor: pointer; color: var(--dropdown-menu-color, #333); background-color: var(--dropdown-menu-bg-color, #fff); } - .e-item.selected > .e-link { + li.selected > a { background-color: var(--dropdown-menu-selected-bg-color, #eee); } - .e-item:not(.disabled) > .e-link:focus, - .e-item:not(.disabled) > .e-link:hover { + li:not(.disabled) > a:focus, + li:not(.disabled) > a:hover { background-color: var(--dropdown-menu-hover-bg-color, #444); background-image: none; color: var(--dropdown-menu-hover-color, #eee); } - .e-item.disabled > .e-link { + li.disabled > a { cursor: not-allowed; opacity: 0.5; } diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less index 8739d3981..5d31a95dc 100644 --- a/dev/Styles/User/MessageView.less +++ b/dev/Styles/User/MessageView.less @@ -459,31 +459,6 @@ padding-right: 10px; } } - - .thread-list { - - .e-link { - padding: 4px 8px 6px 10px; - } - - &.hide-more .thread-list-message.more-that { - display: none; - } - - .thread-date { - font-size: 13px; - color: #999; - } - - .more-threads { - text-align: center; - padding: 8px; - background-color: #F5F5F5; - color: #555; - text-decoration: underline; - border-top: 1px dashed #555; - } - } } html.rl-mobile .messageView, diff --git a/dev/Styles/User/SystemDropDown.less b/dev/Styles/User/SystemDropDown.less index 6c9b40ca2..87dd29de9 100644 --- a/dev/Styles/User/SystemDropDown.less +++ b/dev/Styles/User/SystemDropDown.less @@ -84,7 +84,7 @@ display: inline-block; } - .g-ui-menu .e-link.account-item { + .dropdown-menu a.account-item { padding-right: 5px; } } diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 10c867caa..d2a194163 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -390,20 +390,6 @@ export class MailMessageView extends AbstractViewRight { [message] ); } - - el = eqs(event, '.thread-list .flagParent'); - if (el) { - const message = ko.dataFor(el); - message && message.folder && message.uid && rl.app.messageListAction( - message.folder, - message.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag, - [message] - ); - - this.threadsDropdownTrigger(true); - - return false; - } }); AppUserStore.focusedState.subscribe((value) => { diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 954789913..6ccbc333a 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -17,9 +17,9 @@ 📁 -