Merge branch 'master' into dev/elastic

program/js/app.js

@@ -7303,7 +7303,7 @@ function rcube_webmail()
       .addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
       .addEventListener('expand', function(node) { ref.folder_collapsed(node) })
       .addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
-      .draggable({cancel: 'li.mailbox.root,input,div.treetoggle'})
+      .draggable({cancel: 'li.mailbox.root,input,div.treetoggle,.custom-control'})
       .droppable({
         // @todo: find better way, accept callback is executed for every folder
         // on the list when dragging starts (and stops), this is slow, but

program/js/treelist.js

@@ -138,8 +138,9 @@ function rcube_treelist_widget(node, p)
         return true;
 
       var node = p.selectable ? indexbyid[dom2id($(this))] : null;
-      if (node && !node.virtual) {
-        select(node.id);
+      if (node) {
+        if (!node.virtual)
+          select(node.id);
         e.stopPropagation();
       }
     })

program/localization/en_US/messages.inc

@@ -19,7 +19,7 @@ $messages['errortitle']  = 'An error occurred!';
 $messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or expired.';
-$messages['cookiesmismatch'] = 'Cookies mismatch detected. Clear cookies in your browser, please.';
+$messages['cookiesmismatch'] = 'Cookie mismatch detected. Please, clear your browser\'s cookies.';
 $messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';

skins/elastic/styles/styles.less

@@ -353,7 +353,7 @@ body.task-error-login #layout {
     .header-title {
         .overflow-ellipsis;
         white-space: nowrap;
-        max-width: 7em;
+        max-width: 8em;
         font-weight: bold;
         padding-right: 1rem;
         vertical-align: top;

skins/elastic/styles/widgets/forms.less

@@ -1306,7 +1306,6 @@ html.ms .propform {
         &:after {
             border-radius: .6rem;
             margin: .15rem 0;
-            cursor: pointer;
 
             html.touch & {
                 border-radius: .8rem;
@@ -1346,6 +1345,12 @@ html.ms .propform {
             transform: translateX(1rem);
         }
     }
+
+    .custom-control-input:not(:disabled) ~ .custom-control-label {
+        &:after, &:before {
+            cursor: pointer;
+        }
+    }
 }
 
 .custom-file {