From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- skins/larry/templates/messageerror.html | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html index 2f52432..a735d47 100644 --- a/skins/larry/templates/messageerror.html +++ b/skins/larry/templates/messageerror.html @@ -16,17 +16,6 @@ <div id="mainscreen"> -<div id="mailview-left"> - -<!-- folders list --> -<div id="mailboxcontainer" class="uibox listbox"> -<div class="scroller"> - <roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" /> -</div> -</div> - -</div> - <!-- toolbar --> <div id="messagetoolbar" class="fullwidth"> <div id="mailtoolbar" class="toolbar"> @@ -34,7 +23,18 @@ </div> </div> -<div id="mailview-right" class="uibox" style="top: 42px"> +<div id="mailview-left"> + +<!-- folders list --> +<div id="mailboxcontainer" class="uibox listbox"> +<div class="scroller"> + <roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" /> +</div> +</div> + +</div> + +<div id="mailview-right" class="offset uibox"> <div id="messagecontent" class="watermark"></div> -- Gitblit v1.9.1