Browse Source

show disabled feeds in pref feed tree, use opacity instead of fixed gray color

Andrew Dolgov 11 months ago
parent
commit
cf1ef002bc
6 changed files with 17 additions and 13 deletions
  1. 3 3
      css/default.css
  2. 1 1
      css/default.css.map
  3. 4 4
      css/tt-rss.less
  4. 5 1
      js/PrefFeedTree.js
  5. 3 3
      themes/night.css
  6. 1 1
      themes/night.css.map

+ 3 - 3
css/default.css

@@ -631,9 +631,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
 body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
-  color: #909090;
-}
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
   border: 1px solid transparent;
 }
@@ -978,6 +975,9 @@ body.ttrss_main i.icon-syndicate {
 body.ttrss_main i.icon-no-feed {
   opacity: 0.2;
 }
+body.ttrss_main .dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
+  opacity: 0.5;
+}
 body.ttrss_main #floatingTitle.marked i.marked-pic,
 body.ttrss_main .cdm.marked .left i.marked-pic,
 body.ttrss_main .hl.marked .left i.marked-pic {

File diff suppressed because it is too large
+ 1 - 1
css/default.css.map


+ 4 - 4
css/tt-rss.less

@@ -735,10 +735,6 @@ body.ttrss_main {
 				color : red;
 			}
 
-			.dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
-				color : #909090;
-			}
-
 			.dijitTreeNode .dijitTreeRow {
 				border : 1px solid transparent;
 			}
@@ -1155,6 +1151,10 @@ body.ttrss_main {
 		opacity : 0.2;
 	}
 
+	.dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
+		opacity : 0.5;
+	}
+
 	#floatingTitle.marked i.marked-pic,
 	.cdm.marked .left i.marked-pic,
 	.hl.marked .left i.marked-pic {

+ 5 - 1
js/PrefFeedTree.js

@@ -76,8 +76,12 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			this.tree.model.store.save();
 		},
 		getRowClass: function (item, opened) {
-			return (!item.error || item.error == '') ? "dijitTreeRow" :
+			let rc = (!item.error || item.error == '') ? "dijitTreeRow" :
 				"dijitTreeRow Error";
+
+			if (item.updates_disabled > 0) rc += " UpdatesDisabled";
+
+			return rc;
 		},
 		getIconClass: function (item, opened) {
 			return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feed-icon";

+ 3 - 3
themes/night.css

@@ -631,9 +631,6 @@ body.ttrss_main #feeds-holder #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
 body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.Error .dijitTreeLabel {
   color: red;
 }
-body.ttrss_main #feeds-holder #feedTree .dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
-  color: #909090;
-}
 body.ttrss_main #feeds-holder #feedTree .dijitTreeNode .dijitTreeRow {
   border: 1px solid transparent;
 }
@@ -978,6 +975,9 @@ body.ttrss_main i.icon-syndicate {
 body.ttrss_main i.icon-no-feed {
   opacity: 0.2;
 }
+body.ttrss_main .dijitTreeRow.UpdatesDisabled .dijitTreeLabel {
+  opacity: 0.5;
+}
 body.ttrss_main #floatingTitle.marked i.marked-pic,
 body.ttrss_main .cdm.marked .left i.marked-pic,
 body.ttrss_main .hl.marked .left i.marked-pic {

File diff suppressed because it is too large
+ 1 - 1
themes/night.css.map