diff --git a/dev/Common/Enums.jsx b/dev/Common/Enums.jsx index 68594a2f2..2cc74877f 100644 --- a/dev/Common/Enums.jsx +++ b/dev/Common/Enums.jsx @@ -323,8 +323,7 @@ export const SaveSettingsStep = { export const Layout = { 'NoPreview': 0, 'SidePreview': 1, - 'BottomPreview': 2, - 'Mobile': 3 + 'BottomPreview': 2 }; /** diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js index 1111a83c5..10698fc2f 100644 --- a/dev/Stores/User/Settings.js +++ b/dev/Stores/User/Settings.js @@ -62,7 +62,6 @@ Globals.$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue); Globals.$html.toggleClass('rl-side-preview-pane', Enums.Layout.SidePreview === nValue); Globals.$html.toggleClass('rl-bottom-preview-pane', Enums.Layout.BottomPreview === nValue); - Globals.$html.toggleClass('rl-mobile-layout', Enums.Layout.Mobile === nValue); Events.pub('layout', [nValue]); }); diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less index d183e9cb0..2ae58070d 100644 --- a/dev/Styles/MessageList.less +++ b/dev/Styles/MessageList.less @@ -616,7 +616,7 @@ html.ssm-state-desktop-large { } } -html.cssanimations.rl-anim .messageList .line-loading { +html.cssanimations .messageList .line-loading { height: 5px !important; } diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 14b29d865..a84c2d9e1 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -581,7 +581,7 @@ html.rl-bottom-preview-pane .messageView { } } -html.cssanimations.rl-anim .messageItem .line-loading { +html.cssanimations .messageItem .line-loading { height: 5px !important; } diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 3a1631f83..4e5df3e9a 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -204,6 +204,16 @@ return this.isSpamFolder() && !this.isSpamDisabled() && !this.isDraftFolder() && !this.isSentFolder(); }, this); + this.mobileCheckedStateShow = ko.computed(function () { + var checked = 0 < this.messageListChecked().length; + return this.mobile ? checked : true; + }, this); + + this.mobileCheckedStateHide = ko.computed(function () { + var checked = 0 < this.messageListChecked().length; + return this.mobile ? !checked : true; + }, this); + this.messageListFocused = ko.computed(function () { return Enums.Focused.MessageList === AppStore.focusedState(); }); diff --git a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html index a1c707d2c..9b7d939f6 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -16,18 +16,18 @@
 
-
+
-
 
-
+
 
+ -
 
+
 
-
 
-
+ -
 
+