From 3e0ac3bfb82964f853bb6add368d254f3e910fc4 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 24 Mar 2017 14:19:48 +0100
Subject: [PATCH] Keep all lists style in lists.less

---
 skins/elastic/styles/styles.less              |   2 -
 skins/elastic/styles/widgets/folderlist.less  |  66 ------
 skins/elastic/styles/widgets/lists.less       | 206 ++++++++++++++++++
 skins/elastic/styles/widgets/messagelist.less | 146 -------------
 4 files changed, 206 insertions(+), 214 deletions(-)
 delete mode 100644 skins/elastic/styles/widgets/folderlist.less
 delete mode 100644 skins/elastic/styles/widgets/messagelist.less

diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index 796855379..458910f07 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -189,8 +189,6 @@ body.iframe {
 @import "widgets/toolbar.less";
 @import "widgets/searchbar.less";
 @import "widgets/lists.less";
-@import "widgets/folderlist.less";
-@import "widgets/messagelist.less";
 @import "widgets/messagebody.less";
 @import "widgets/attachmentlist.less";
 @import "widgets/googiespell.less";
diff --git a/skins/elastic/styles/widgets/folderlist.less b/skins/elastic/styles/widgets/folderlist.less
deleted file mode 100644
index 7299a0c3a..000000000
--- a/skins/elastic/styles/widgets/folderlist.less
+++ /dev/null
@@ -1,66 +0,0 @@
-/*** Folders list widget ***/
-
-
-.folderlist {
-    li {
-        &.mailbox {
-            .unreadcount {
-                position: absolute;
-                top: 0;
-                right: 0;
-                min-width: 2em;
-                line-height: 1.4em;
-                margin: 0.5em 0.2em;
-                padding: 0 0.3em;
-                background:  /* todo */ #1e70bf;
-                border-radius: 0.4em;
-                color: @badge-font-color;
-                text-align: center;
-                font-weight: bold;
-            }
-
-            &.selected .unreadcount {
-                background: /* todo */;
-            }
-
-            &.recent > .unreadcount {
-                background: /* todo */;
-            }
-
-            &.unread {
-                /* TODO */
-            }
-
-            &.recent {
-                /* TODO */
-            }
-        }
-
-        a:before {
-            &:extend(.font-icon-class);
-            content: @fa-var-folder-o;
-        }
-
-        &.inbox a:before {
-            content: @fa-var-inbox;
-        }
-        &.trash a:before {
-            content: @fa-var-trash;
-        }
-        &.trash.empty a:before {
-            content: @fa-var-trash-o;
-        }
-        &.drafts a:before {
-            content: @fa-var-edit;
-        }
-        &.sent a:before {
-            content: @fa-var-paper-plane;
-        }
-        &.junk a:before {
-            content: @fa-var-recycle;
-        }
-        &.archive a:before {
-            content: @fa-var-archive;
-        }
-    }
-}
diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 5aa078e18..9ec970d8d 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -201,3 +201,209 @@ ul.treelist li div.treetoggle {
         content: @fa-var-minus-square-o;
     }
 }
+
+/*** Folders list widget ***/
+
+.folderlist {
+    li {
+        &.mailbox {
+            .unreadcount {
+                position: absolute;
+                top: 0;
+                right: 0;
+                min-width: 2em;
+                line-height: 1.4em;
+                margin: 0.5em 0.2em;
+                padding: 0 0.3em;
+                background:  /* todo */ #1e70bf;
+                border-radius: 0.4em;
+                color: @badge-font-color;
+                text-align: center;
+                font-weight: bold;
+            }
+
+            &.selected .unreadcount {
+                background: /* todo */;
+            }
+
+            &.recent > .unreadcount {
+                background: /* todo */;
+            }
+
+            &.unread {
+                /* TODO */
+            }
+
+            &.recent {
+                /* TODO */
+            }
+        }
+
+        a:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-folder-o;
+        }
+
+        &.inbox a:before {
+            content: @fa-var-inbox;
+        }
+        &.trash a:before {
+            content: @fa-var-trash;
+        }
+        &.trash.empty a:before {
+            content: @fa-var-trash-o;
+        }
+        &.drafts a:before {
+            content: @fa-var-edit;
+        }
+        &.sent a:before {
+            content: @fa-var-paper-plane;
+        }
+        &.junk a:before {
+            content: @fa-var-recycle;
+        }
+        &.archive a:before {
+            content: @fa-var-archive;
+        }
+    }
+}
+
+/*** Messages list widget ***/
+
+.messagelist > thead,
+.messagelist .branch,
+table.fixedcopy {
+    display: none;
+}
+
+.messagelist {
+    td {
+        border-left: 0;
+        width: 2em;
+        vertical-align: top;
+    }
+
+    td.subject {
+        width: 99%;
+        white-space: wrap;
+        position: relative; /* for span.date positioning in Firefox */
+
+        span {
+            line-height: 2em;
+
+            &.date {
+                right: 2px;
+                top: 3px;
+                position: absolute;
+                color: #666; /* TODO */
+            }
+
+            &.fromto {
+                padding-left: 1.5em;
+                display: block;
+                margin-right: 10em;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                color: #666; /* TODO */
+            }
+
+            &.subject {
+                clear: both;
+                display: block;
+                font-size: 1em;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+        }
+    }
+
+    td.threads {
+        vertical-align: bottom;
+    }
+
+    td.flags {
+        span {
+            width: 20px;
+            height: 20px;
+            display: block;
+            margin-left: 1px;
+
+            &.flag {
+                cursor: pointer;
+            }
+        }
+    }
+
+    tr.flagged td.subject span.date,
+    tr.flagged td.subject span.fromto {
+        color: #ff5c33; /* TODO */
+    }
+
+    tr.deleted td.subject span.date,
+    tr.deleted td.subject span.fromto {
+        color: #ccc; /* TODO */
+    }
+
+    tr.unread td.subject span.subject {
+        /* TODO font-weight: bold? */
+    }
+
+    /* thread parent message with unread children */
+    tr.unroot td.subject a {
+        text-decoration: underline;
+    }
+
+    tr.thread td.threads div:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-caret-square-o-right;
+    }
+    tr.thread.expanded td.threads div:before {
+        content: @fa-var-caret-square-o-down;
+    }
+    td.subject span.msgicon.status:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-circle-o;
+    }
+    tr.unread td.subject span.msgicon.status:before {
+        content: @fa-var-circle;
+    }
+    td.subject span.msgicon.unreadchildren:before {
+        content: @fa-var-dot-circle-o;
+    }
+    td.subject span.msgicon.status.replied:before {
+        content: @fa-var-mail-reply;
+    }
+    td.subject span.msgicon.status.forwarded:before {
+        content: @fa-var-mail-forward;
+    }
+    td.subject span.msgicon.status.replied.forwarded:before {
+        content: @fa-var-mail-forward; /* TODO */
+    }
+    tr.deleted td.subject span.msgicon.status:before {
+        content: @fa-var-ban;
+    }
+
+    span.attachment span {
+        &:extend(.font-icon-class);
+
+        &:before {
+            content: @fa-var-paperclip;
+        }
+        &.report:before {
+            content: @fa-var-file-text-o;
+        }
+        &.encrypted:before {
+            content: @fa-var-lock;
+        }
+    }
+
+    span.flagged:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag;
+    }
+
+    tr:hover span.unflagged:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag-o;
+    }
+}
diff --git a/skins/elastic/styles/widgets/messagelist.less b/skins/elastic/styles/widgets/messagelist.less
deleted file mode 100644
index 035392322..000000000
--- a/skins/elastic/styles/widgets/messagelist.less
+++ /dev/null
@@ -1,146 +0,0 @@
-/*** Messages list widget ***/
-
-.messagelist > thead,
-.messagelist .branch,
-table.fixedcopy {
-    display: none;
-}
-
-.messagelist {
-    td {
-        border-left: 0;
-        width: 2em;
-        vertical-align: top;
-    }
-
-    td.subject {
-        width: 99%;
-        white-space: wrap;
-        position: relative; /* for span.date positioning in Firefox */
-
-        span {
-            line-height: 2em;
-
-            &.date {
-                right: 2px;
-                top: 3px;
-                position: absolute;
-                color: #666; /* TODO */
-            }
-
-            &.fromto {
-                padding-left: 1.5em;
-                display: block;
-                margin-right: 10em;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                color: #666; /* TODO */
-            }
-
-            &.subject {
-                clear: both;
-                display: block;
-                font-size: 1em;
-                overflow: hidden;
-                text-overflow: ellipsis;
-            }
-        }
-    }
-
-    td.threads {
-        vertical-align: bottom;
-    }
-
-    td.flags {
-        span {
-            width: 20px;
-            height: 20px;
-            display: block;
-            margin-left: 1px;
-
-            &.flag {
-                cursor: pointer;
-            }
-        }
-    }
-
-    tr.flagged td.subject span.date,
-    tr.flagged td.subject span.fromto {
-        color: #ff5c33; /* TODO */
-    }
-
-    tr.deleted td.subject span.date,
-    tr.deleted td.subject span.fromto {
-        color: #ccc; /* TODO */
-    }
-
-    tr.unread td.subject span.subject {
-        /* TODO font-weight: bold? */
-    }
-
-    /* thread parent message with unread children */
-    tr.unroot td.subject a {
-        text-decoration: underline;
-    }
-}
-
-
-/* font icons */
-
-.messagelist tr.thread td.threads div:before,
-.messagelist td.subject span.msgicon.status:before,
-.messagelist span.attachment span:before,
-.messagelist span.flagged:before,
-.messagelist tr:hover span.unflagged:before {
-    &:extend(.font-icon-class);
-}
-
-.messagelist {
-    tr.thread td.threads div:before {
-        content: @fa-var-caret-square-o-right;
-    }
-    tr.thread.expanded td.threads div:before {
-        content: @fa-var-caret-square-o-down;
-    }
-    td.subject span.msgicon.status:before {
-        content: @fa-var-circle-o;
-    }
-    tr.unread td.subject span.msgicon.status:before {
-        content: @fa-var-circle;
-    }
-    td.subject span.msgicon.unreadchildren:before {
-        content: @fa-var-dot-circle-o;
-    }
-    td.subject span.msgicon.status.replied:before {
-        content: @fa-var-mail-reply;
-    }
-    td.subject span.msgicon.status.forwarded:before {
-        content: @fa-var-mail-forward;
-    }
-    td.subject span.msgicon.status.replied.forwarded:before {
-        content: @fa-var-mail-forward; /* TODO */
-    }
-    tr.deleted td.subject span.msgicon.status:before {
-        content: @fa-var-ban;
-    }
-
-    span.attachment span {
-        &:before {
-            content: @fa-var-paperclip;
-        }
-        &.report:before {
-            content: @fa-var-file-text-o;
-        }
-        &.encrypted:before {
-            content: @fa-var-lock;
-        }
-    }
-
-    span.flagged:before {
-        content: @fa-var-flag;
-    }
-
-    tr:hover span.unflagged:before {
-        content: @fa-var-flag-o;
-    }
-}