xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collapse actions summary list in filter tree if 'toggle rule display' is disabled, remove label-specific icon display, simplify markup

Browse Source
This commit is contained in:
Andrew Dolgov
2024-11-23 17:43:20 +03:00
parent 81ccfed4b4
commit d4636716fb
10 changed files with 124 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
themes/compact.css
View File

@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
body.ttrss_utility.sanity_failed {
background: #900;
}
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}

21
themes/compact_night.css
View File

@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
.flat {
/*#feedTree {
.dijitTreeContent .dijitInline {
@@ -1866,11 +1882,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}

21
themes/light-high-contrast.css
View File

@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
body.ttrss_utility.sanity_failed {
background: #900;
}
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}

21
themes/light.css
View File

@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
body.ttrss_utility.sanity_failed {
background: #900;
}
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}

6
themes/light/dijit_basic.less
View File

@@ -148,12 +148,6 @@
top : -2px;
}*/
.labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.dijitTreeRow.filterDisabled {
opacity : 0.5;

22
themes/light/prefs.less
View File

@@ -268,6 +268,15 @@ body.ttrss_prefs {
word-break : break-all;
}
}
ul.actions_summary {
float : right;
margin-right : 16px;
margin-top : 0;
list-style-type : none;
text-align : right;
}
}
body.ttrss_prefs,
@@ -315,4 +324,17 @@ body.ttrss_prefs[hide-filter-rules="true"] {
ul.filterRules {
display : none;
}
ul.actions_summary li {
display : inline;
}
ul.actions_summary li:after {
content: ", ";
}
ul.actions_summary li:last-child:after {
content: " ";
}
}

21
themes/night.css
View File

@@ -1717,6 +1717,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1754,6 +1761,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
.flat {
/*#feedTree {
.dijitTreeContent .dijitInline {
@@ -1867,11 +1883,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}

21
themes/night_blue.css
View File

@@ -1717,6 +1717,13 @@ body.ttrss_prefs .phpinfo td.v {
font-family: monospace;
word-break: break-all;
}
body.ttrss_prefs ul.actions_summary {
float: right;
margin-right: 16px;
margin-top: 0;
list-style-type: none;
text-align: right;
}
body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
background: #ffc0c0;
@@ -1754,6 +1761,15 @@ body.ttrss_utility fieldset > label.checkbox {
body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
display: none;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
display: inline;
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
content: ", ";
}
body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
content: " ";
}
.flat {
/*#feedTree {
.dijitTreeContent .dijitInline {
@@ -1867,11 +1883,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
.flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
color: white;
}
.flat .dijitTree .labelParam {
float: right;
margin-right: 16px;
text-align: right;
}
.flat .dijitTree .dijitTreeRow.filterDisabled {
opacity: 0.5;
}