mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
messagelist search without float
and remove some usePreviewPane
This commit is contained in:
parent
b1c7bd2c50
commit
0d6335ed2c
9 changed files with 29 additions and 40 deletions
|
|
@ -363,7 +363,7 @@ export class Selector {
|
||||||
focused.checked(!focused.checked());
|
focused.checked(!focused.checked());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (' ' !== sEventKey && (this.autoSelect() || !!bForceSelect) && !this.isListChecked()) {
|
if (' ' !== sEventKey && (this.autoSelect() || bForceSelect) && !this.isListChecked()) {
|
||||||
this.selectedItem(result);
|
this.selectedItem(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ export class GeneralUserSettings {
|
||||||
|
|
||||||
this.editorDefaultType = SettingsStore.editorDefaultType;
|
this.editorDefaultType = SettingsStore.editorDefaultType;
|
||||||
this.layout = SettingsStore.layout;
|
this.layout = SettingsStore.layout;
|
||||||
this.usePreviewPane = SettingsStore.usePreviewPane;
|
|
||||||
|
|
||||||
this.enableSoundNotification = NotificationStore.enableSoundNotification;
|
this.enableSoundNotification = NotificationStore.enableSoundNotification;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,10 +36,6 @@ html.rl-started-delay {
|
||||||
transition: left 0.3s ease-out, right 0.3s ease-out;
|
transition: left 0.3s ease-out, right 0.3s ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
#rl-sub-left, #rl-sub-left .messageList .inputSearch {
|
|
||||||
transition: width 0.3s ease-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
#rl-sub-right {
|
#rl-sub-right {
|
||||||
transition: left 0.3s ease-out;
|
transition: left 0.3s ease-out;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -251,10 +251,6 @@ html:not(.rl-left-panel-disabled) #rl-left.resizable > .resizer,
|
||||||
|
|
||||||
#rl-sub-left {
|
#rl-sub-left {
|
||||||
width: 310px;
|
width: 310px;
|
||||||
|
|
||||||
.messageList .inputSearch {
|
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#rl-sub-right {
|
#rl-sub-right {
|
||||||
|
|
@ -339,10 +335,6 @@ html.rl-no-preview-pane {
|
||||||
#rl-sub-left {
|
#rl-sub-left {
|
||||||
right: @rlBottomMargin !important;
|
right: @rlBottomMargin !important;
|
||||||
width: inherit;
|
width: inherit;
|
||||||
|
|
||||||
.messageList .inputSearch {
|
|
||||||
width: 300px !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#rl-sub-right {
|
#rl-sub-right {
|
||||||
|
|
@ -366,20 +358,12 @@ html.rl-bottom-preview-pane:not(.rl-mobile) {
|
||||||
|
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.messageList .inputSearch {
|
|
||||||
width: 300px !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#rl-sub-right {
|
#rl-sub-right {
|
||||||
|
|
||||||
left: 0 !important;
|
left: 0 !important;
|
||||||
|
|
||||||
.messageView .top-toolbar {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.b-message-view-wrapper {
|
.b-message-view-wrapper {
|
||||||
top: 356px;
|
top: 356px;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
|
|
||||||
|
|
@ -47,10 +47,6 @@ html.rl-no-preview-pane {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.inputSearch {
|
|
||||||
width: 258px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn.buttonMoreSearch {
|
.btn.buttonMoreSearch {
|
||||||
padding-left: 8px;
|
padding-left: 8px;
|
||||||
padding-right: 8px;
|
padding-right: 8px;
|
||||||
|
|
@ -91,6 +87,22 @@ html.rl-no-preview-pane {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.input-append {
|
||||||
|
margin-left: 14px;
|
||||||
|
text-align: right;
|
||||||
|
width: calc(100% - 30px);
|
||||||
|
|
||||||
|
.close-input-wrp {
|
||||||
|
width: 90%;
|
||||||
|
min-width: 200px;
|
||||||
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.inputSearch {
|
||||||
|
width: calc(100% - 14px);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.line-loading {
|
.line-loading {
|
||||||
|
|
@ -462,13 +474,6 @@ html .messageList .line-loading {
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
html.rl-mobile {
|
|
||||||
#rl-sub-left .messageList .inputSearch {
|
|
||||||
width: 160px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.messageListItem {
|
.messageListItem {
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -605,6 +605,12 @@ html.rl-no-preview-pane .messageView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html:not(.rl-mobile):not(.rl-no-preview-pane) .messageView {
|
||||||
|
.top-toolbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
html.rl-bottom-preview-pane:not(.rl-mobile) .messageView {
|
html.rl-bottom-preview-pane:not(.rl-mobile) .messageView {
|
||||||
.b-content {
|
.b-content {
|
||||||
bottom: @rlBottomMargin;
|
bottom: @rlBottomMargin;
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,6 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
|
||||||
this.useThreads = SettingsStore.useThreads;
|
this.useThreads = SettingsStore.useThreads;
|
||||||
this.replySameFolder = SettingsStore.replySameFolder;
|
this.replySameFolder = SettingsStore.replySameFolder;
|
||||||
this.layout = SettingsStore.layout;
|
this.layout = SettingsStore.layout;
|
||||||
this.usePreviewPane = SettingsStore.usePreviewPane;
|
|
||||||
this.isMessageSelected = MessageStore.isMessageSelected;
|
this.isMessageSelected = MessageStore.isMessageSelected;
|
||||||
this.messageActiveDom = MessageStore.messageActiveDom;
|
this.messageActiveDom = MessageStore.messageActiveDom;
|
||||||
this.messageError = MessageStore.messageError;
|
this.messageError = MessageStore.messageError;
|
||||||
|
|
@ -284,14 +283,14 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
|
||||||
@command((self) => !self.messageListAndMessageViewLoading())
|
@command((self) => !self.messageListAndMessageViewLoading())
|
||||||
goUpCommand() {
|
goUpCommand() {
|
||||||
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-up',
|
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-up',
|
||||||
{detail:SettingsStore.usePreviewPane() || !!this.message()}
|
{detail:SettingsStore.usePreviewPane() || !!this.message()} // bForceSelect
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@command((self) => !self.messageListAndMessageViewLoading())
|
@command((self) => !self.messageListAndMessageViewLoading())
|
||||||
goDownCommand() {
|
goDownCommand() {
|
||||||
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-down',
|
dispatchEvent(new CustomEvent('mailbox.message-list.selector.go-down',
|
||||||
{detail:SettingsStore.usePreviewPane() || !!this.message()}
|
{detail:SettingsStore.usePreviewPane() || !!this.message()} // bForceSelect
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,8 @@
|
||||||
<div class="b-message-list-wrapper">
|
<div class="b-message-list-wrapper">
|
||||||
<div class="second-toolbar thm-message-list-top-toolbar">
|
<div class="second-toolbar thm-message-list-top-toolbar">
|
||||||
<div class="form-inline">
|
<div class="form-inline">
|
||||||
<div class="input-append pull-right" data-bind="visible: allowSearch">
|
<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
|
||||||
|
<div class="input-append" data-bind="visible: allowSearch">
|
||||||
<div class="close-input-wrp">
|
<div class="close-input-wrp">
|
||||||
<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">×</a>
|
<a class="close" data-bind="click: cancelSearch, visible: '' !== messageListSearchDesc()">×</a>
|
||||||
<input type="text" class="i18n span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
|
<input type="text" class="i18n span4 inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: inputProxyMessageListSearch, onEnter: searchEnterAction, hasfocus: inputMessageListSearchFocus" />
|
||||||
|
|
@ -121,7 +122,6 @@
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="b-content" data-bind="initDom: dragOverBodyArea">
|
<div class="b-content" data-bind="initDom: dragOverBodyArea">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<div id="rl-sub-right">
|
<div id="rl-sub-right">
|
||||||
<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'message-focused': messageFocused}">
|
<div class="messageView" data-bind="css: {'message-selected': isMessageSelected, 'message-focused': messageFocused}">
|
||||||
<div class="toolbar top-toolbar g-ui-user-select-none" data-bind="visible: !usePreviewPane()">
|
<div class="toolbar top-toolbar g-ui-user-select-none">
|
||||||
<div class="messageButtons btn-toolbar">
|
<div class="messageButtons btn-toolbar">
|
||||||
<div class="btn-group" data-bind="tooltip: 'GLOBAL/CLOSE'">
|
<div class="btn-group" data-bind="tooltip: 'GLOBAL/CLOSE'">
|
||||||
<a class="btn buttonClose fontastic" data-bind="command: closeMessageCommand">✖</a>
|
<a class="btn buttonClose fontastic" data-bind="command: closeMessageCommand">✖</a>
|
||||||
|
|
@ -95,7 +95,7 @@
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</div>
|
</div>
|
||||||
<div data-bind="visible: allowMessageListActions && usePreviewPane()" class="dividerbar">
|
<div data-bind="visible: allowMessageListActions" class="dividerbar">
|
||||||
<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
|
<li class="e-item" role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
|
||||||
<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
|
<a target="_blank" class="e-link menuitem" href="#" tabindex="-1" data-bind="command: archiveCommand">
|
||||||
<i class="icon-archive"></i>
|
<i class="icon-archive"></i>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue