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

update css for disabled filters; remove strikethrough

This commit is contained in:
Andrew Dolgov 2018-12-08 15:49:52 +03:00
parent 8822134685
commit 4887db9820
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/default.css
View File

@ -1782,9 +1782,11 @@ body#sharepopup input {
float: right; float: right;
margin-right: 16px; margin-right: 16px;
} }
.flat .dijitTree .labelParam.filterDisabled, .flat .dijitTree .dijitTreeRow.filterDisabled {
.flat .dijitTree .dijitTreeLabel.filterDisabled { opacity: 0.5;
text-decoration: line-through; }
.flat .dijitTree .dijitTreeRow.filterDisabled .filterRules {
filter: saturate(0%);
} }
.flat .dijitTree .feedParam { .flat .dijitTree .feedParam {
float: right; float: right;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

10
css/dijit_basic.less
View File

@ -74,14 +74,18 @@
position : relative; position : relative;
top : -2px; top : -2px;
} }
.labelParam { .labelParam {
float: right; float: right;
margin-right: 16px; margin-right: 16px;
} }
.labelParam.filterDisabled, .dijitTreeRow.filterDisabled {
.dijitTreeLabel.filterDisabled { opacity : 0.5;
text-decoration : line-through;
.filterRules {
filter : saturate(0%);
}
} }
.feedParam { .feedParam {

9
js/PrefFilterTree.js
View File

@ -55,13 +55,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
getIconClass: function (item, opened) { getIconClass: function (item, opened) {
return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible"; return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
}, },
getLabelClass: function (item, opened) {
const enabled = this.model.store.getValue(item, 'enabled');
return (enabled != false) ? "dijitTreeLabel labelFixedLength" : "dijitTreeLabel labelFixedLength filterDisabled";
},
getRowClass: function (item, opened) { getRowClass: function (item, opened) {
return (!item.error || item.error == '') ? "dijitTreeRow" : const enabled = this.model.store.getValue(item, 'enabled');
"dijitTreeRow Error";
return enabled ? "dijitTreeRow" : "dijitTreeRow filterDisabled";
}, },
checkItemAcceptance: function(target, source, position) { checkItemAcceptance: function(target, source, position) {
const item = dijit.getEnclosingWidget(target).item; const item = dijit.getEnclosingWidget(target).item;

8
themes/night.css
View File

@ -1782,9 +1782,11 @@ body#sharepopup input {
float: right; float: right;
margin-right: 16px; margin-right: 16px;
} }
.flat .dijitTree .labelParam.filterDisabled, .flat .dijitTree .dijitTreeRow.filterDisabled {
.flat .dijitTree .dijitTreeLabel.filterDisabled { opacity: 0.5;
text-decoration: line-through; }
.flat .dijitTree .dijitTreeRow.filterDisabled .filterRules {
filter: saturate(0%);
} }
.flat .dijitTree .feedParam { .flat .dijitTree .feedParam {
float: right; float: right;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long