From f804caec90fa8f1c1b3210d64fa66eba65bf8241 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 9 Mar 2021 18:55:28 +0300 Subject: [PATCH] support coloring counters by feed-id/is-cat; set fresh counter to green --- js/FeedTree.js | 6 ++++++ themes/compact.css | 3 +++ themes/compact_night.css | 3 +++ themes/light.css | 3 +++ themes/light/tt-rss.less | 5 +++++ themes/night.css | 3 +++ themes/night_blue.css | 3 +++ 7 files changed, 26 insertions(+) diff --git a/js/FeedTree.js b/js/FeedTree.js index 17cd3deea..af0f420d6 100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -82,6 +82,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co } if (id.match("FEED:")) { + tnode.rowNode.setAttribute('data-feed-id', bare_id); + tnode.rowNode.setAttribute('data-is-cat', "false"); + const menu = new dijit.Menu(); menu.row_id = bare_id; @@ -132,6 +135,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co } if (id.match("CAT:")) { + tnode.rowNode.setAttribute('data-feed-id', bare_id); + tnode.rowNode.setAttribute('data-is-cat', "true"); + tnode.loadingNode = dojo.create('img', { className: 'loadingNode', src: 'images/blank_icon.gif'}); domConstruct.place(tnode.loadingNode, tnode.labelNode, 'after'); } diff --git a/themes/compact.css b/themes/compact.css index 16a05cadd..7209c7575 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -587,6 +587,9 @@ body.ttrss_main #feeds-holder #feedTree .counterNode { min-width: 23px; height: 14px; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: #3ea447; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { left: -3px; height: 22px; diff --git a/themes/compact_night.css b/themes/compact_night.css index aabadc867..04111c574 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -587,6 +587,9 @@ body.ttrss_main #feeds-holder #feedTree .counterNode { min-width: 23px; height: 14px; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: #3ea447; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { left: -3px; height: 22px; diff --git a/themes/light.css b/themes/light.css index 252a9a7cc..f3bde5756 100644 --- a/themes/light.css +++ b/themes/light.css @@ -587,6 +587,9 @@ body.ttrss_main #feeds-holder #feedTree .counterNode { min-width: 23px; height: 14px; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: #3ea447; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { left: -3px; height: 22px; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index 36b73b4f4..6eeac7429 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -676,6 +676,11 @@ body.ttrss_main { height : 14px; } + // fresh + .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: darken(@color-checked, 15%); + } + .dijitTreeNode .loadingExpando { left : -3px; height : 22px; diff --git a/themes/night.css b/themes/night.css index 3226031dd..5f4d4e503 100644 --- a/themes/night.css +++ b/themes/night.css @@ -588,6 +588,9 @@ body.ttrss_main #feeds-holder #feedTree .counterNode { min-width: 23px; height: 14px; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: #3ea447; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { left: -3px; height: 22px; diff --git a/themes/night_blue.css b/themes/night_blue.css index 615c5bbd8..9a73889f9 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -588,6 +588,9 @@ body.ttrss_main #feeds-holder #feedTree .counterNode { min-width: 23px; height: 14px; } +body.ttrss_main #feeds-holder #feedTree .dijitTreeRow[data-feed-id="-3"][data-is-cat="false"] .counterNode.unread { + background-color: #3ea447; +} body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .loadingExpando { left: -3px; height: 22px;