implement special counter display when viewing by published, similar to marked

2 files changed, 29 insertions, 5 deletions

diff --git a/themes/light/defines.less b/themes/light/defines.less
index 37d1beadf..10b8675c5 100644
--- a/themes/light/defines.less
+++ b/themes/light/defines.less
@@ -8,6 +8,7 @@
 @color-published: lighten(#ff5718, 10%);
 @color-marked: #ffc069;
 @color-accent-marked : @color-accent;
+@color-accent-published : darken(@color-published, 30%);
 @color-panel-bg: #f5f5f5;
 @color-checked: #69C671;
 @border-default : #ddd;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 12d3cea34..a39f6677b 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -646,7 +646,7 @@ body.ttrss_main {
 						height : 14px;
 						flex-shrink : 0;
 
-						&.aux, &.marked {
+						&.aux, &.marked, &.published {
 							background : @color-panel-bg;
 							color : lighten(@default-text, 10%);
 							border-color : darken(@color-panel-bg, 10%);
@@ -654,7 +654,12 @@ body.ttrss_main {
 
 						&.marked {
 							border-color : @color-accent-marked;
-							background : lighten(@color-accent-marked, 60%);
+							background : @default-bg;
+						}
+
+						&.published {
+							border-color : @color-accent-published;
+							background : @default-bg;
 						}
 					}
 
@@ -1141,18 +1146,36 @@ body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree {
 	}
 }
 
+body.ttrss_main[view-mode="published"] #feeds-holder #feedTree {
+	.dijitTreeRow.Has_Published .dijitTreeLabel {
+		color : @color-accent-published;
+	}
+	.dijitTreeRow.Has_Published .counterNode.published {
+		display : inline-block;
+	}
+}
+
 body.ttrss_main[view-mode="marked"][hide-read-feeds="true"][hide-read-shows-special="true"] #feeds-holder #feedTree
 	.dijitTreeRow:not(.AlwaysVisible):not(.Special):not(.Has_Marked) {
 		display : none;
 }
 
+body.ttrss_main[view-mode="published"][hide-read-feeds="true"][hide-read-shows-special="true"] #feeds-holder #feedTree
+	.dijitTreeRow:not(.AlwaysVisible):not(.Special):not(.Has_Published) {
+		display : none;
+}
+
 body.ttrss_main[view-mode="marked"][hide-read-feeds="true"][hide-read-shows-special="false"] #feeds-holder #feedTree
 	.dijitTreeRow:not(.AlwaysVisible):not(.Has_Marked) {
 		display : none;
 }
 
+body.ttrss_main[view-mode="published"][hide-read-feeds="true"][hide-read-shows-special="false"] #feeds-holder #feedTree
+	.dijitTreeRow:not(.AlwaysVisible):not(.Has_Published) {
+		display : none;
+}
 
-body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree {
+body.ttrss_main:not([view-mode="marked"]):not([view-mode="published"]) #feeds-holder #feedTree {
 	.dijitTreeRow.Unread .counterNode.unread {
 		display : inline-block;
 	}
@@ -1161,12 +1184,12 @@ body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree {
 	}
 }
 
-body.ttrss_main:not([view-mode="marked"])[hide-read-feeds="true"][hide-read-shows-special="true"] #feeds-holder #feedTree
+body.ttrss_main:not([view-mode="marked"]):not([view-mode="published"])[hide-read-feeds="true"][hide-read-shows-special="true"] #feeds-holder #feedTree
 	.dijitTreeRow:not(.Unread):not(.AlwaysVisible):not(.Special) {
 		display : none;
 }
 
-body.ttrss_main:not([view-mode="marked"])[hide-read-feeds="true"][hide-read-shows-special="false"] #feeds-holder #feedTree
+body.ttrss_main:not([view-mode="marked"]):not([view-mode="published"])[hide-read-feeds="true"][hide-read-shows-special="false"] #feeds-holder #feedTree
 	.dijitTreeRow:not(.Unread):not(.AlwaysVisible) {
 		display : none;
 }