From 3bed1067d17af96f0222050940b6421afc9aa97c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 28 Dec 2017 16:24:23 +0100
Subject: [PATCH] Better icon for Junk folder (#136)

---
 skins/elastic/styles/widgets/lists.less   | 2 +-
 skins/elastic/styles/widgets/toolbar.less | 2 +-
 skins/elastic/ui.js                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/skins/elastic/styles/widgets/lists.less b/skins/elastic/styles/widgets/lists.less
index 33a8c4230..bfd9a41ec 100644
--- a/skins/elastic/styles/widgets/lists.less
+++ b/skins/elastic/styles/widgets/lists.less
@@ -505,7 +505,7 @@ ul.treelist li {
             .font-icon-solid(@fa-var-paper-plane);
         }
         &.junk a:before {
-            .font-icon-solid(@fa-var-recycle);
+            .font-icon-solid(@fa-var-fire);
         }
         &.archive > a:before {
             .font-icon-solid(@fa-var-archive);
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 0b31a18fd..8139d317f 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -106,7 +106,7 @@
             content: @fa-var-archive;
         }
         &.junk:before {
-            content: @fa-var-recycle;
+            content: @fa-var-fire;
         }
         &.enigma:before,
         &.encrypt:before {
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 3d4d258d9..25ff91d32 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1744,7 +1744,7 @@ function rcube_elastic_ui()
 
                 if (!is_mobile()) {
                     // Set popup height so it is less than the window height
-                    popup.css('max-height', Math.min(510, $(window).height() - 30));
+                    popup.css('max-height', Math.min(36 * 15 - 1, $(window).height() - 30));
                 }
             })
             .on('shown.bs.popover', function(event) {