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/settings.css |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/skins/classic/settings.css b/skins/classic/settings.css
index 24c4382..336422e 100644
--- a/skins/classic/settings.css
+++ b/skins/classic/settings.css
@@ -34,6 +34,11 @@
   height: 18px;
 }
 
+#identities-table tbody tr.readonly td
+{
+  font-style: italic;
+}
+
 #subscription-table tr.virtual td
 {
   color: #666;
@@ -81,10 +86,19 @@
 }
 
 #identity-details table td.title,
+#response-details table td.title,
 #folder-details table td.title
 {
   font-weight: bold;
   text-align: right;
+}
+
+#response-details table td.title
+{
+  text-align: left;
+  vertical-align: top;
+  width: 140px;
+  padding-top: 5px;
 }
 
 #bottomboxes
@@ -147,6 +161,12 @@
   float: right;
 }
 
+#formfooter .footerindent
+{
+  padding: 10px 0;
+  margin-left: 155px;
+}
+
 #quota
 {
   position: absolute;
@@ -198,6 +218,46 @@
   margin-top: 1.5em;
 }
 
+.skinselection
+{
+  display: block;
+  white-space: nowrap;
+  margin: 0.3em 0;
+}
+
+.skinselection span
+{
+  display: inline-block;
+  vertical-align: middle;
+  padding-right: 1em;
+}
+
+.skinselection .skinname
+{
+  font-weight: bold;
+}
+
+.skinselection .skinlicense,
+.skinselection .skinlicense a
+{
+  color: #999;
+  font-style: italic;
+  text-decoration: none;
+}
+
+.skinselection .skinlicense a:hover
+{
+  text-decoration: underline;
+}
+
+img.skinthumbnail
+{
+  width: 64px;
+  height: 64px;
+  border: 1px solid #999;
+  background: #fff;
+}
+
 #pluginlist
 {
   border: 1px solid #999;

--
Gitblit v1.9.1