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/common.css | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/skins/classic/common.css b/skins/classic/common.css
index 8f5daee..b035a11 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -145,6 +145,14 @@
color: #999999;
}
+/* fixes vertical alignment of checkboxes and labels */
+label input,
+label span
+{
+ vertical-align: middle;
+}
+
+
/** common user interface objects */
#mainscreen
@@ -494,7 +502,8 @@
margin: 3px -4px;
}
-.popupmenu li a
+.popupmenu li a,
+.popupmenu li label
{
display: block;
color: #a0a0a0;
@@ -502,6 +511,14 @@
text-decoration: none;
min-height: 14px;
background: transparent;
+}
+
+.popupmenu li label.comment
+{
+ color: #999;
+ font-style: italic;
+ padding-top: 4px;
+ padding-bottom: 3px;
}
.popupmenu li a.active,
@@ -614,6 +631,32 @@
background-color: #929292;
}
+ul.treelist li
+{
+ position: relative;
+}
+
+ul.treelist li div.treetoggle
+{
+ position: absolute;
+ left: 8px !important;
+ left: -16px;
+ top: 1px;
+ width: 14px;
+ height: 16px;
+ cursor: pointer;
+}
+
+ul.treelist li div.collapsed
+{
+ background: url(images/icons/collapsed.png) bottom right no-repeat;
+}
+
+ul.treelist li div.expanded
+{
+ background: url(images/icons/expanded.png) bottom right no-repeat;
+}
+
/***** mac-style quicksearch field *****/
@@ -658,7 +701,26 @@
font-size: 11px;
padding: 0px;
border: none;
+ outline: none;
}
+
+.propform div.prop
+{
+ margin-bottom: 0.5em;
+}
+
+.propform div.prop.block label
+{
+ display: block;
+ margin-bottom: 2px;
+}
+
+.propform div.prop.block input,
+.propform div.prop.block textarea
+{
+ width: 97%;
+}
+
/***** roundcube webmail pre-defined classes *****/
@@ -782,6 +844,14 @@
color: #666;
}
+#login-noscriptwarning
+{
+ margin: 2em auto 0 auto;
+ width: 400px;
+ color: #cf2734;
+ font-weight: bold;
+}
+
#console
{
opacity: 0.8;
--
Gitblit v1.9.1