1. feedtree: show counters for marked articles if view-mode == marked
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:
parent
5b6d9cee29
commit
60288f02e8
|
@ -175,6 +175,9 @@ class Counters {
|
||||||
"auxcounter" => (int) $auxctr
|
"auxcounter" => (int) $auxctr
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if ($i == -1)
|
||||||
|
$cv["markedcounter"] = $auxctr;
|
||||||
|
|
||||||
array_push($ret, $cv);
|
array_push($ret, $cv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,7 +208,8 @@ class Counters {
|
||||||
|
|
||||||
$sth = $pdo->prepare("SELECT id,
|
$sth = $pdo->prepare("SELECT id,
|
||||||
caption,
|
caption,
|
||||||
SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread,
|
SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS count_unread,
|
||||||
|
SUM(CASE WHEN u1.marked = true THEN 1 ELSE 0 END) AS count_marked,
|
||||||
COUNT(u1.unread) AS total
|
COUNT(u1.unread) AS total
|
||||||
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
|
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
|
||||||
(ttrss_labels2.id = label_id)
|
(ttrss_labels2.id = label_id)
|
||||||
|
@ -220,8 +224,9 @@ class Counters {
|
||||||
|
|
||||||
$cv = [
|
$cv = [
|
||||||
"id" => $id,
|
"id" => $id,
|
||||||
"counter" => (int) $line["unread"],
|
"counter" => (int) $line["count_unread"],
|
||||||
"auxcounter" => (int) $line["total"]
|
"auxcounter" => (int) $line["total"],
|
||||||
|
"markedcounter" => (int) $line["count_marked"]
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($descriptions)
|
if ($descriptions)
|
||||||
|
|
|
@ -1393,7 +1393,7 @@ class Pref_Feeds extends Handler_Protected {
|
||||||
$obj['items'] = array();
|
$obj['items'] = array();
|
||||||
$obj['name'] = Feeds::getCategoryTitle($cat_id);
|
$obj['name'] = Feeds::getCategoryTitle($cat_id);
|
||||||
$obj['type'] = 'category';
|
$obj['type'] = 'category';
|
||||||
$obj['unread'] = (int) Feeds::getCategoryUnread($cat_id);
|
$obj['unread'] = -1; //(int) Feeds::getCategoryUnread($cat_id);
|
||||||
$obj['bare_id'] = $cat_id;
|
$obj['bare_id'] = $cat_id;
|
||||||
|
|
||||||
return $obj;
|
return $obj;
|
||||||
|
|
|
@ -554,14 +554,18 @@ body.ttrss_main #feeds-holder #feedTree {
|
||||||
text-rendering: optimizelegibility;
|
text-rendering: optimizelegibility;
|
||||||
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
|
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;
|
background: #f5f5f5;
|
||||||
color: #6f6f6f;
|
color: #6f6f6f;
|
||||||
border-color: #dcdcdc;
|
border-color: #dcdcdc;
|
||||||
}
|
}
|
||||||
|
body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
|
border-color: #257aa7;
|
||||||
|
}
|
||||||
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: inline-block;
|
display: none;
|
||||||
font-size: 9px;
|
font-size: 9px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #2a89bc;
|
border: 1px solid #2a89bc;
|
||||||
|
@ -866,9 +870,18 @@ body.ttrss_main .dijitDialog h3:first-of-type,
|
||||||
body.ttrss_main .dijitDialog h4:first-of-type {
|
body.ttrss_main .dijitDialog h4:first-of-type {
|
||||||
margin-top: 0px;
|
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;
|
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 {
|
body.ttrss_main #toolbar-headlines i.icon-syndicate {
|
||||||
color: #ff7c4b;
|
color: #ff7c4b;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -646,15 +646,20 @@ body.ttrss_main {
|
||||||
text-rendering: optimizelegibility;
|
text-rendering: optimizelegibility;
|
||||||
font-family : @fonts-ui;
|
font-family : @fonts-ui;
|
||||||
|
|
||||||
.counterNode.aux {
|
.counterNode.aux, .counterNode.marked {
|
||||||
background : @color-panel-bg;
|
background : @color-panel-bg;
|
||||||
color : lighten(@default-text, 10%);
|
color : lighten(@default-text, 10%);
|
||||||
border-color : darken(@color-panel-bg, 10%);
|
border-color : darken(@color-panel-bg, 10%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.counterNode.marked {
|
||||||
|
border-color : @color-accent-marked;
|
||||||
|
background : lighten(@color-accent-marked, 60%);
|
||||||
|
}
|
||||||
|
|
||||||
.counterNode {
|
.counterNode {
|
||||||
font-weight : bold;
|
font-weight : bold;
|
||||||
display : inline-block;
|
display : none;
|
||||||
font-size : 9px;
|
font-size : 9px;
|
||||||
text-align : center;
|
text-align : center;
|
||||||
border : 1px solid lighten(@color-accent, 5%);;
|
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 {
|
body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree {
|
||||||
color : @color-accent-marked;
|
.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 {
|
body.ttrss_main {
|
||||||
|
|
|
@ -16,17 +16,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
|
|
||||||
if (iconName) {
|
if (iconName) {
|
||||||
if (iconName.indexOf("/") == -1) {
|
if (iconName.indexOf("/") == -1) {
|
||||||
iconNode = dojo.doc.createElement("i");
|
iconNode = dojo.create("i", { className: "material-icons icon icon-" + iconName, innerHTML: iconName });
|
||||||
iconNode.className = "material-icons icon icon-" + iconName;
|
|
||||||
iconNode.innerHTML = iconName;
|
|
||||||
} else {
|
} else {
|
||||||
iconNode = dojo.doc.createElement('img');
|
iconNode = dojo.create('img', { className: 'icon' });
|
||||||
if (args.item.icon && args.item.icon[0]) {
|
if (args.item.icon && args.item.icon[0]) {
|
||||||
iconNode.src = args.item.icon[0];
|
iconNode.src = args.item.icon[0];
|
||||||
} else {
|
} else {
|
||||||
iconNode.src = 'images/blank_icon.gif';
|
iconNode.src = 'images/blank_icon.gif';
|
||||||
}
|
}
|
||||||
iconNode.className = 'icon';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,12 +34,11 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
const bare_id = parseInt(id.substr(id.indexOf(':')+1));
|
const bare_id = parseInt(id.substr(id.indexOf(':')+1));
|
||||||
|
|
||||||
if (bare_id < _label_base_index) {
|
if (bare_id < _label_base_index) {
|
||||||
const label = dojo.doc.createElement('i');
|
const label = dojo.create('i', { className: "material-icons icon icon-label", innerHTML: "label" });
|
||||||
|
|
||||||
//const fg_color = args.item.fg_color[0];
|
//const fg_color = args.item.fg_color[0];
|
||||||
const bg_color = args.item.bg_color[0];
|
const bg_color = args.item.bg_color[0];
|
||||||
|
|
||||||
label.className = "material-icons icon icon-label";
|
|
||||||
label.innerHTML = "label";
|
|
||||||
label.setStyle({
|
label.setStyle({
|
||||||
color: bg_color,
|
color: bg_color,
|
||||||
});
|
});
|
||||||
|
@ -73,12 +69,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + this.getParent().row_id +
|
window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + this.getParent().row_id +
|
||||||
"&csrf_token=" + App.getInitParam("csrf_token"));
|
"&csrf_token=" + App.getInitParam("csrf_token"));
|
||||||
}}));
|
}}));
|
||||||
|
|
||||||
/* menu.addChild(new dijit.MenuItem({
|
|
||||||
label: __("Update feed"),
|
|
||||||
onClick: function() {
|
|
||||||
heduleFeedUpdate(this.getParent().row_id, false);
|
|
||||||
}})); */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.bindDomNode(tnode.domNode);
|
menu.bindDomNode(tnode.domNode);
|
||||||
|
@ -106,11 +96,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id.match("CAT:")) {
|
if (id.match("CAT:")) {
|
||||||
loading = dojo.doc.createElement('img');
|
tnode.loadingNode = dojo.create('img', { className: 'loadingNode', src: 'images/blank_icon.gif'});
|
||||||
loading.className = 'loadingNode';
|
domConstruct.place(tnode.loadingNode, tnode.labelNode, 'after');
|
||||||
loading.src = 'images/blank_icon.gif';
|
|
||||||
domConstruct.place(loading, tnode.labelNode, 'after');
|
|
||||||
tnode.loadingNode = loading;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id.match("CAT:") && bare_id == -1) {
|
if (id.match("CAT:") && bare_id == -1) {
|
||||||
|
@ -127,20 +114,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
tnode._menu = menu;
|
tnode._menu = menu;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctr = dojo.doc.createElement('span');
|
tnode.markedCounterNode = dojo.create('span', { className: 'counterNode marked', innerHTML: args.item.markedcounter });
|
||||||
ctr.className = 'counterNode';
|
domConstruct.place(tnode.markedCounterNode, tnode.rowNode, 'first');
|
||||||
ctr.innerHTML = args.item.unread > 0 ? args.item.unread : args.item.auxcounter;
|
|
||||||
|
|
||||||
//args.item.unread > 0 ? ctr.addClassName("unread") : ctr.removeClassName("unread");
|
tnode.auxCounterNode = dojo.create('span', { className: 'counterNode aux', innerHTML: args.item.auxcounter });
|
||||||
|
domConstruct.place(tnode.auxCounterNode, tnode.rowNode, 'first');
|
||||||
|
|
||||||
args.item.unread > 0 || args.item.auxcounter > 0 ? Element.show(ctr) : Element.hide(ctr);
|
tnode.unreadCounterNode = dojo.create('span', { className: 'counterNode unread', innerHTML: args.item.unread });
|
||||||
|
domConstruct.place(tnode.unreadCounterNode, tnode.rowNode, 'first');
|
||||||
|
|
||||||
args.item.unread <= 0 && args.item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
|
|
||||||
|
|
||||||
domConstruct.place(ctr, tnode.rowNode, 'first');
|
|
||||||
tnode.counterNode = ctr;
|
|
||||||
|
|
||||||
//tnode.labelNode.innerHTML = args.label;
|
|
||||||
return tnode;
|
return tnode;
|
||||||
},
|
},
|
||||||
postCreate: function() {
|
postCreate: function() {
|
||||||
|
@ -156,26 +138,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
|
|
||||||
//console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
|
//console.log("updateCounter: " + item.id[0] + " " + item.unread + " " + tree);
|
||||||
|
|
||||||
let node = tree._itemNodesMap[item.id];
|
let treeNode = tree._itemNodesMap[item.id];
|
||||||
|
|
||||||
if (node) {
|
if (treeNode) {
|
||||||
node = node[0];
|
treeNode = treeNode[0];
|
||||||
|
|
||||||
if (node.counterNode) {
|
treeNode.unreadCounterNode.innerHTML = item.unread;
|
||||||
ctr = node.counterNode;
|
treeNode.auxCounterNode.innerHTML = item.auxcounter;
|
||||||
ctr.innerHTML = item.unread > 0 ? item.unread : item.auxcounter;
|
treeNode.markedCounterNode.innerHTML = item.markedcounter;
|
||||||
item.unread > 0 || item.auxcounter > 0 ?
|
|
||||||
item.unread > 0 ?
|
|
||||||
Effect.Appear(ctr, {duration : 0.3,
|
|
||||||
queue: { position: 'end', scope: 'CAPPEAR-' + item.id, limit: 1 }}) :
|
|
||||||
Element.show(ctr) :
|
|
||||||
Element.hide(ctr);
|
|
||||||
|
|
||||||
item.unread <= 0 && item.auxcounter > 0 ? ctr.addClassName("aux") : ctr.removeClassName("aux");
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
getTooltip: function (item) {
|
getTooltip: function (item) {
|
||||||
return [item.updated, item.error].filter(x => x && x != "").join(" - ");
|
return [item.updated, item.error].filter(x => x && x != "").join(" - ");
|
||||||
|
@ -191,6 +162,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
"dijitTreeRow Error";
|
"dijitTreeRow Error";
|
||||||
|
|
||||||
if (item.unread > 0) rc += " Unread";
|
if (item.unread > 0) rc += " Unread";
|
||||||
|
if (item.auxcounter > 0) rc += " Has_Aux";
|
||||||
if (item.markedcounter > 0) rc += " Has_Marked";
|
if (item.markedcounter > 0) rc += " Has_Marked";
|
||||||
if (item.updates_disabled > 0) rc += " UpdatesDisabled";
|
if (item.updates_disabled > 0) rc += " UpdatesDisabled";
|
||||||
|
|
||||||
|
@ -269,6 +241,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
selectFeed: function(feed, is_cat) {
|
selectFeed: function(feed, is_cat) {
|
||||||
this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
|
this.findNodeParentsAndExpandThem(feed, is_cat, false, false);
|
||||||
|
|
||||||
|
let treeNode;
|
||||||
|
|
||||||
if (is_cat)
|
if (is_cat)
|
||||||
treeNode = this._itemNodesMap['CAT:' + feed];
|
treeNode = this._itemNodesMap['CAT:' + feed];
|
||||||
else
|
else
|
||||||
|
@ -300,6 +274,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setFeedIcon: function(feed, is_cat, src) {
|
setFeedIcon: function(feed, is_cat, src) {
|
||||||
|
let treeNode;
|
||||||
|
|
||||||
if (is_cat)
|
if (is_cat)
|
||||||
treeNode = this._itemNodesMap['CAT:' + feed];
|
treeNode = this._itemNodesMap['CAT:' + feed];
|
||||||
else
|
else
|
||||||
|
@ -307,15 +283,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
|
|
||||||
if (treeNode) {
|
if (treeNode) {
|
||||||
treeNode = treeNode[0];
|
treeNode = treeNode[0];
|
||||||
const icon = dojo.doc.createElement('img');
|
const icon = dojo.create('img', { src: src, className: 'icon' });
|
||||||
icon.src = src;
|
|
||||||
icon.className = 'icon';
|
|
||||||
domConstruct.place(icon, treeNode.iconNode, 'only');
|
domConstruct.place(icon, treeNode.iconNode, 'only');
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
setFeedExpandoIcon: function(feed, is_cat, src) {
|
setFeedExpandoIcon: function(feed, is_cat, src) {
|
||||||
|
let treeNode;
|
||||||
|
|
||||||
if (is_cat)
|
if (is_cat)
|
||||||
treeNode = this._itemNodesMap['CAT:' + feed];
|
treeNode = this._itemNodesMap['CAT:' + feed];
|
||||||
else
|
else
|
||||||
|
@ -327,9 +303,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
treeNode.loadingNode.src = src;
|
treeNode.loadingNode.src = src;
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
const icon = dojo.doc.createElement('img');
|
const icon = dojo.create('img', { src: src, className: 'loadingExpando' });
|
||||||
icon.src = src;
|
|
||||||
icon.className = 'loadingExpando';
|
|
||||||
domConstruct.place(icon, treeNode.expandoNode, 'only');
|
domConstruct.place(icon, treeNode.expandoNode, 'only');
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -460,6 +434,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
return rv;
|
return rv;
|
||||||
},
|
},
|
||||||
getNextFeed: function (feed, is_cat) {
|
getNextFeed: function (feed, is_cat) {
|
||||||
|
let treeItem;
|
||||||
|
|
||||||
if (is_cat) {
|
if (is_cat) {
|
||||||
treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
|
treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
|
||||||
} else {
|
} else {
|
||||||
|
@ -498,6 +474,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getPreviousFeed: function (feed, is_cat) {
|
getPreviousFeed: function (feed, is_cat) {
|
||||||
|
let treeItem;
|
||||||
|
|
||||||
if (is_cat) {
|
if (is_cat) {
|
||||||
treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
|
treeItem = this.model.store._itemsByIdentity['CAT:' + feed];
|
||||||
} else {
|
} else {
|
||||||
|
|
1937
themes/light.css
1937
themes/light.css
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
@import "../css/default.css";
|
@import "../css/default.less";
|
||||||
|
|
|
@ -555,14 +555,19 @@ body.ttrss_main #feeds-holder #feedTree {
|
||||||
text-rendering: optimizelegibility;
|
text-rendering: optimizelegibility;
|
||||||
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
|
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: #222;
|
background: #222;
|
||||||
color: #e6e6e6;
|
color: #e6e6e6;
|
||||||
border-color: #080808;
|
border-color: #080808;
|
||||||
}
|
}
|
||||||
|
body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
|
border-color: #b87d2c;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: inline-block;
|
display: none;
|
||||||
font-size: 9px;
|
font-size: 9px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #cd8b31;
|
border: 1px solid #cd8b31;
|
||||||
|
@ -867,9 +872,18 @@ body.ttrss_main .dijitDialog h3:first-of-type,
|
||||||
body.ttrss_main .dijitDialog h4:first-of-type {
|
body.ttrss_main .dijitDialog h4:first-of-type {
|
||||||
margin-top: 0px;
|
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: #b87d2c;
|
color: #b87d2c;
|
||||||
}
|
}
|
||||||
|
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 {
|
body.ttrss_main #toolbar-headlines i.icon-syndicate {
|
||||||
color: #ff7c4b;
|
color: #ff7c4b;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
@ -1965,11 +1979,15 @@ body.flat.ttrss_main #feeds-holder {
|
||||||
background: #222;
|
background: #222;
|
||||||
box-shadow: inset -1px 0px 2px -1px #666;
|
box-shadow: inset -1px 0px 2px -1px #666;
|
||||||
}
|
}
|
||||||
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux {
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
|
||||||
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
background: #222;
|
background: #222;
|
||||||
color: #ccc;
|
color: #ccc;
|
||||||
border-color: #333;
|
border-color: #333;
|
||||||
}
|
}
|
||||||
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
|
border-color: #b87d2c;
|
||||||
|
}
|
||||||
body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
|
body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
|
||||||
background: #333;
|
background: #333;
|
||||||
border-color: #333 transparent;
|
border-color: #333 transparent;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -65,12 +65,16 @@ body.flat.ttrss_main {
|
||||||
box-shadow : inset -1px 0px 2px -1px @border-light;
|
box-shadow : inset -1px 0px 2px -1px @border-light;
|
||||||
|
|
||||||
#feedTree {
|
#feedTree {
|
||||||
.counterNode.aux {
|
.counterNode.aux, .counterNode.marked {
|
||||||
background: @color-panel-bg;
|
background: @color-panel-bg;
|
||||||
color: @default-text;
|
color: @default-text;
|
||||||
border-color: @default-bg;
|
border-color: @default-bg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.counterNode.marked {
|
||||||
|
border-color : @color-accent-marked;
|
||||||
|
}
|
||||||
|
|
||||||
.dijitTreeRowSelected {
|
.dijitTreeRowSelected {
|
||||||
background : @default-bg;
|
background : @default-bg;
|
||||||
border-color : @default-bg transparent;
|
border-color : @default-bg transparent;
|
||||||
|
|
|
@ -555,14 +555,19 @@ body.ttrss_main #feeds-holder #feedTree {
|
||||||
text-rendering: optimizelegibility;
|
text-rendering: optimizelegibility;
|
||||||
font-family: "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
|
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: #222;
|
background: #222;
|
||||||
color: #e6e6e6;
|
color: #e6e6e6;
|
||||||
border-color: #080808;
|
border-color: #080808;
|
||||||
}
|
}
|
||||||
|
body.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
|
border-color: #257aa7;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
body.ttrss_main #feeds-holder #feedTree .counterNode {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: inline-block;
|
display: none;
|
||||||
font-size: 9px;
|
font-size: 9px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
border: 1px solid #2a89bc;
|
border: 1px solid #2a89bc;
|
||||||
|
@ -867,9 +872,18 @@ body.ttrss_main .dijitDialog h3:first-of-type,
|
||||||
body.ttrss_main .dijitDialog h4:first-of-type {
|
body.ttrss_main .dijitDialog h4:first-of-type {
|
||||||
margin-top: 0px;
|
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;
|
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 {
|
body.ttrss_main #toolbar-headlines i.icon-syndicate {
|
||||||
color: #ff7c4b;
|
color: #ff7c4b;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
@ -1965,11 +1979,15 @@ body.flat.ttrss_main #feeds-holder {
|
||||||
background: #222;
|
background: #222;
|
||||||
box-shadow: inset -1px 0px 2px -1px #666;
|
box-shadow: inset -1px 0px 2px -1px #666;
|
||||||
}
|
}
|
||||||
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux {
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.aux,
|
||||||
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
background: #222;
|
background: #222;
|
||||||
color: #ccc;
|
color: #ccc;
|
||||||
border-color: #333;
|
border-color: #333;
|
||||||
}
|
}
|
||||||
|
body.flat.ttrss_main #feeds-holder #feedTree .counterNode.marked {
|
||||||
|
border-color: #257aa7;
|
||||||
|
}
|
||||||
body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
|
body.flat.ttrss_main #feeds-holder #feedTree .dijitTreeRowSelected {
|
||||||
background: #333;
|
background: #333;
|
||||||
border-color: #333 transparent;
|
border-color: #333 transparent;
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue