valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2018-12-08 16:10:37 +03:00
parent b96beeeda7
commit cf1ef002bc
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/default.css
View File

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

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

8
css/tt-rss.less
View File

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

6
js/PrefFeedTree.js
View File

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

6
themes/night.css
View File

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

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long