Fix border issue on folders list in classic skin (#1489473)

2 files changed, 43 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index bd37a7dd9..4736f3349 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix border issue on folders list in classic skin (#1489473)
 - Implemented menu actions to copy/move messages, added folder-selector widget (#1484086)
 - Fix security rules in .htaccess preventing access to base URL without the ending slash (#1489477)
 - Fix regression where only first new folder was placed in correct place on the list (#1489472)
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index c887ab346..7c414b477 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -395,13 +395,12 @@
   display: block;
   position: relative;
   font-size: 11px;
-  background: url(images/icons/folders.png) 5px 0 no-repeat;
   border-bottom: 1px solid #EBEBEB;
 }
 
 #mailboxlist li ul li:last-child
 {
-  border-bottom: none;
+  border-bottom: 0 none;
 }
 
 #mailboxlist li.inbox
@@ -439,6 +438,7 @@
   padding-bottom: 2px;
   text-decoration: none;
   height: 15px;
+  background: url(images/icons/folders.png) 5px 0 no-repeat;
 }
 
 #mailboxlist li.unread
@@ -480,13 +480,50 @@
   padding: 0;
   margin: 0;
   border-top: 1px solid #EBEBEB;
-  padding-left: 15px;
-  background-position: 25px 1px;
   background-color: #FFF;
-  color: blue;
   font-weight: normal;
 }
 
+#mailboxlist li.mailbox ul li a {
+  padding-left: 36px;  /* 20 + 1 x 16 */
+  background-position: 16px 0;  /* 1 x 16 */
+}
+#mailboxlist li.mailbox ul li div.treetoggle {
+  left: 19px !important;
+}
+
+#mailboxlist li.mailbox ul ul li.mailbox a {
+  padding-left: 52px;  /* 2x */
+  background-position: 32px 0;
+}
+#mailboxlist li.mailbox ul ul li div.treetoggle {
+  left: 35px !important;
+}
+
+#mailboxlist li.mailbox ul ul ul li.mailbox a {
+  padding-left: 68px;  /* 3x */
+  background-position: 48px 0;
+}
+#mailboxlist li.mailbox ul ul ul li div.treetoggle {
+  left: 51px !important;
+}
+
+#mailboxlist li.mailbox ul ul ul ul li.mailbox a {
+  padding-left: 84px;  /* 4x */
+  background-position: 64px 0;
+}
+#mailboxlist li.mailbox ul ul ul ul li div.treetoggle {
+  left: 70px !important;
+}
+
+/* indent folders on levels > 4 */
+#mailboxlist li.mailbox ul ul ul ul ul li {
+  padding-left: 16px;
+}
+#mailboxlist li.mailbox ul ul ul ul ul li div.treetoggle {
+  left: 89px !important;
+}
+
 #listcontrols
 {
   position: relative;