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/folders.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/skins/larry/templates/folders.html b/skins/larry/templates/folders.html
index ab4e46c..988ff95 100644
--- a/skins/larry/templates/folders.html
+++ b/skins/larry/templates/folders.html
@@ -28,7 +28,9 @@
 </div>
 
 <div id="folder-details" class="uibox contentbox">
-	<roundcube:object name="folderframe" id="preferences-frame" style="width:100%; height:96%" frameborder="0" src="/watermark.html" />
+	<div class="iframebox">
+		<roundcube:object name="folderframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
 	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 

--
Gitblit v1.9.1