public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

1. feedtree: show counters for marked articles if view-mode == marked

Browse Source 
2. hide/show relevant counter nodes using css
3. cleanup some counter-related code
4. compile default css into light theme to prevent cache-related issues
This commit is contained in:
Andrew Dolgov
2020-02-20 14:14:45 +03:00
parent 5b6d9cee29
commit 60288f02e8
14 changed files with 2069 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
css/default.css
View File

@@ -554,14 +554,18 @@ body.ttrss_main #feeds-holder #feedTree {
text-rendering: optimizelegibility;
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
}
body.ttrss_main #feeds-holder #feedTree .counterNode.aux {
body.ttrss_main #feeds-holder #feedTree .counterNode.aux,
body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
background: #f5f5f5;
color: #6f6f6f;
border-color: #dcdcdc;
}
body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
border-color: #257aa7;
}
body.ttrss_main #feeds-holder #feedTree .counterNode {
font-weight: bold;
display: inline-block;
display: none;
font-size: 9px;
text-align: center;
border: 1px solid #2a89bc;
@@ -866,9 +870,18 @@ body.ttrss_main .dijitDialog h3:first-of-type,
body.ttrss_main .dijitDialog h4:first-of-type {
margin-top: 0px;
}
body.ttrss_main[view-mode="marked"] .dijitTreeRow.Has_Marked .dijitTreeLabel {
body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
color: #257aa7;
}
body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .counterNode.marked {
display: inline-block;
}
body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree .dijitTreeRow.Unread .counterNode.unread {
display: inline-block;
}
body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree .dijitTreeRow.Has_Aux:not(.Unread) .counterNode.aux {
display: inline-block;
}
body.ttrss_main #toolbar-headlines i.icon-syndicate {
color: #ff7c4b;
margin-right: 8px;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

27
css/tt-rss.less
View File

@@ -646,15 +646,20 @@ body.ttrss_main {
text-rendering: optimizelegibility;
font-family : @fonts-ui;
.counterNode.aux {
.counterNode.aux, .counterNode.marked {
background : @color-panel-bg;
color : lighten(@default-text, 10%);
border-color : darken(@color-panel-bg, 10%);
}
.counterNode.marked {
border-color : @color-accent-marked;
background : lighten(@color-accent-marked, 60%);
}
.counterNode {
font-weight : bold;
display : inline-block;
display : none;
font-size : 9px;
text-align : center;
border : 1px solid lighten(@color-accent, 5%);;
@@ -1024,8 +1029,22 @@ body.ttrss_main .dijitDialog {
}
}
body.ttrss_main[view-mode="marked"] .dijitTreeRow.Has_Marked .dijitTreeLabel {
color : @color-accent-marked;
body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree {
.dijitTreeRow.Has_Marked .dijitTreeLabel {
color : @color-accent-marked;
}
.dijitTreeRow.Has_Marked .counterNode.marked {
display : inline-block;
}
}
body.ttrss_main:not([view-mode="marked"]) #feeds-holder #feedTree {
.dijitTreeRow.Unread .counterNode.unread {
display : inline-block;
}
.dijitTreeRow.Has_Aux:not(.Unread) .counterNode.aux {
display : inline-block;
}
}
body.ttrss_main {