diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js index 0c1ec248d..42771b978 100644 --- a/dev/Common/Utils.js +++ b/dev/Common/Utils.js @@ -1075,6 +1075,7 @@ Utils.setExpandedFolder = function (sFullNameHash, bExpanded) Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) { var + iMinWidth = 155, oLeft = $(sLeft), oRight = $(sRight), @@ -1094,15 +1095,17 @@ Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) }, fDisable = function (bDisable) { + var iWidth = 5; if (bDisable) { oLeft.resizable('disable'); - fSetWidth(5); + fSetWidth(iWidth); } else { oLeft.resizable('enable'); - fSetWidth(RL.local().get(sClientSideKeyName) || 170); + iWidth = Utils.pInt(RL.local().get(sClientSideKeyName)) || iMinWidth; + fSetWidth(iWidth > iMinWidth ? iWidth : iMinWidth); } }, @@ -1125,8 +1128,8 @@ Utils.initLayoutResizer = function (sLeft, sRight, sClientSideKeyName) oLeft.resizable({ 'helper': 'ui-resizable-helper', - 'minWidth': 170, - 'maxWidth': 400, + 'minWidth': iMinWidth, + 'maxWidth': 350, 'handles': 'e', 'stop': fResizeFunction }); diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less index 290430983..6061fe55f 100644 --- a/dev/Styles/Layout.less +++ b/dev/Styles/Layout.less @@ -108,7 +108,7 @@ html.ssm-state-desktop { } } -html.ssm-state-tablet, html.ssm-state-mobile { +html.ssm-state-tablet { #rl-left { width: 160px; @@ -139,6 +139,37 @@ html.ssm-state-tablet, html.ssm-state-mobile { } } +html.ssm-state-mobile { + + #rl-left { + width: 155px; + } + + #rl-right { + left: 155px; + } + + #rl-sub-left { + width: 310px; + + .messageList .inputSearch { + width: 200px; + } + } + + #rl-sub-right { + left: 310px; + } + + .b-compose.modal { + width: 800px; + } + + .b-contacts-content.modal { + width: 800px; + } +} + html.rl-left-panel-disabled { #rl-left { diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less index de312e96f..ca1f6ee08 100644 --- a/dev/Styles/Settings.less +++ b/dev/Styles/Settings.less @@ -76,7 +76,7 @@ .b-content { position: absolute; - top: 50px + @rlLowMargin; + top: 50px; bottom: @rlLowMargin; left: 0; right: @rlLowMargin; diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index fc20f855c..1f00a2909 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -87,7 +87,7 @@ select { // } } -.btn, .btn.btn-dark-disabled-border { +.btn.btn-dark-disabled-border { &.disabled, &[disabled] { border-color: #aaa; } diff --git a/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html b/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html index 9b3ef82aa..2da067b74 100644 --- a/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html +++ b/rainloop/v/0.0.0/app/templates/Views/MailFolderList.html @@ -6,9 +6,6 @@ - - -
@@ -20,6 +17,12 @@