1. feedtree: show counters for marked articles if view-mode == marked

2. hide/show relevant counter nodes using css
3. cleanup some counter-related code
4. compile default css into light theme to prevent cache-related issues

1 files changed, 22 insertions, 4 deletions

diff --git a/themes/night.css b/themes/night.css
index 87cf99b1c..e8a385b9f 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -555,14 +555,19 @@ body.ttrss_main #feeds-holder #feedTree {
   text-rendering: optimizelegibility;
   font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
-body.ttrss_main #feeds-holder #feedTree .counterNode.aux {
+body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
+body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
   background: #222;
   color: #e6e6e6;
   border-color: #080808;
 }
+body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+  border-color: #b87d2c;
+  background: #ffffff;
+}
 body.ttrss_main #feeds-holder #feedTree .counterNode {
   font-weight: bold;
-  display: inline-block;
+  display: none;
   font-size: 9px;
   text-align: center;
   border: 1px solid #cd8b31;
@@ -867,9 +872,18 @@ body.ttrss_main .dijitDialog h3:first-of-type,
 body.ttrss_main .dijitDialog h4:first-of-type {
   margin-top: 0px;
 }
-body.ttrss_main[view-mode="marked"] .dijitTreeRow.Has_Marked .dijitTreeLabel {
+body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #b87d2c;
 }
+body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .counterNode.marked {
+  display: inline-block;
+}
+body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree .dijitTreeRow.Unread .counterNode.unread {
+  display: inline-block;
+}
+body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree .dijitTreeRow.Has_Aux:not(.Unread) .counterNode.aux {
+  display: inline-block;
+}
 body.ttrss_main #toolbar-headlines i.icon-syndicate {
   color: #ff7c4b;
   margin-right: 8px;
@@ -1965,11 +1979,15 @@ body.flat.ttrss_main #feeds-holder {
   background: #222;
   box-shadow: inset -1px 0px 2px -1px #666;
 }
-body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux {
+body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
+body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
   background: #222;
   color: #ccc;
   border-color: #333;
 }
+body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
+  border-color: #b87d2c;
+}
 body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
   background: #333;
   border-color: #333 transparent;