Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 37 insertions, 10 deletions

diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
index ebf9ab9d9..90438aa70 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -116,13 +116,6 @@
   overflow: hidden;
 }
 
-#directorylistbox input
-{
-  margin: 0 0 0 20px;
-  font-size: 11px;
-  width: 90%;
-}
-
 #addresslist
 {
   position: absolute;
@@ -144,7 +137,8 @@
   width: 280px;
 }
 
-#directorylist li a
+#directorylist li a,
+#savedsearchlist li a
 {
   cursor: default;
   display: block;
@@ -159,17 +153,45 @@
   background-repeat: no-repeat;
 }
 
-#directorylist li ul li a
+#directorylist ul li a
 {
   padding-left: 45px;
+  background-position: 22px -108px;
+}
+
+#directorylist ul ul li a
+{
+  padding-left: 62px;
+  background-position: 39px -108px;
+}
+
+#directorylist ul ul ul li a
+{
+  padding-left: 79px;
+  background-position: 39px -108px;
 }
 
 #directorylist li.contactgroup a
 {
+  background-position: 5px -143px;
+}
+
+#directorylist ul li.contactgroup a
+{
   background-position: 22px -143px;
 }
 
-#directorylist li.contactsearch a
+#directorylist ul ul li.contactgroup a
+{
+  background-position: 39px -143px;
+}
+
+#directorylist ul ul ul li.contactgroup a
+{
+  background-position: 56px -143px;
+}
+
+#savedsearchlist li.contactsearch a
 {
   background-position: 6px -162px;
 }
@@ -279,6 +301,11 @@ body.iframe,
 	padding: 0;
 }
 
+#contacthead > legend
+{
+	display: none;
+}
+
 #contacthead .names span.namefield,
 #contacthead .names input
 {