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/classic/mail.css |   44 ++++++++++++++++++--------------------------
 1 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index ac346d5..d6764bd 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -155,6 +155,10 @@
   background-position: -416px -32px;
 }
 
+#messagetoolbar a.responses {
+  background-position: -512px 0;
+}
+
 #messagetoolbar select.mboxlist
 {
   position: relative;
@@ -391,32 +395,6 @@
 #mailboxlist li ul li:last-child
 {
   border-bottom: none;
-}
-
-#mailboxlist li div
-{
-  position: absolute;
-  left: 8px !important;
-  left: -16px;
-  top: 1px;
-  width: 14px;
-  height: 16px;
-}
-
-#mailboxlist li div.collapsed,
-#mailboxlist li div.expanded
-{
-  cursor: pointer;
-}
-
-#mailboxlist li div.collapsed
-{
-  background: url(images/icons/collapsed.png) bottom right no-repeat;
-}
-
-#mailboxlist li div.expanded
-{
-  background: url(images/icons/expanded.png) bottom right no-repeat;
 }
 
 #mailboxlist li.inbox
@@ -1568,6 +1546,7 @@
 #compose-attachments ul li
 {
   height: 18px;
+  line-height: 16px;
   font-size: 11px;
   padding-left: 2px;
   padding-top: 2px;
@@ -1692,6 +1671,14 @@
   -o-text-overflow: ellipsis;
 }
 
+#contacts-table td span.email
+{
+  display: inline;
+  color: #ccc;
+  font-style: italic;
+  margin-left: 0.5em;
+}
+
 #abookcountbar
 {
   margin-top: 4px;
@@ -1720,6 +1707,11 @@
   background: url("images/icons/groupactions.png") no-repeat right -70px;
 }
 
+#abookactions a.disabled
+{
+  color: #999;
+}
+
 #compose-contacts #quicksearchbar
 {
   top: 2px;

--
Gitblit v1.9.1