apply special feedTree styles only to main UI feedtree, fix feedParam and filterParam...

diff --git a/css/tt-rss.css b/css/tt-rss.css
index d88fa0aa349a2648a8ff9bbfcd95f4b5837e89e1..a64e59850e09a887d81dc935219f3b3960844ddd 100644 (file)
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -1064,28 +1064,28 @@ div.hl.active {
        margin-right : 25px;
 }
 
-#feedTree .dijitTreeRow {
+body#ttrssMain #feedTree .dijitTreeRow {
        padding : 2px 0px 2px;
        border-width : 1px;
        border-color : transparent;
        color : #333;
 }
 
-#feedTree .dijitFolderClosed,
-#feedTree .dijitFolderOpened {
+body#ttrssMain #feedTree .dijitFolderClosed,
+body#ttrssMain #feedTree .dijitFolderOpened {
        display : none;
 }
 
-#feedTree .dijitTreeIsRoot > .dijitTreeRow > .dijitTreeExpando {
+body#ttrssMain #feedTree .dijitTreeIsRoot > .dijitTreeRow > .dijitTreeExpando {
        margin-left : 5px;
 }
 
-#feedTree .dijitTreeNode {
+body#ttrssMain #feedTree .dijitTreeNode {
        padding : 0px;
        border-width : 0px;
 }
 
-#feedTree { 
+body#ttrssMain #feedTree { 
        height : 100%;
        overflow-x : hidden;
        font-family : "Segoe UI", Tahoma, sans-serif;

diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 942793c768b4d0f798d8186819365a6c8aaa973d..bf21baa9045754a52706bc3681eb36b935c3684e 100644 (file)
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -32,7 +32,8 @@ dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
                        param = dojo.doc.createElement('span');
                        param.className = 'feedParam';
                        param.innerHTML = args.item.param[0];
-                       dojo.place(param, tnode.labelNode, 'after');
+                       //dojo.place(param, tnode.labelNode, 'after');
+                       dojo.place(param, tnode.rowNode, 'first');
                }
 
                var id = args.item.id[0];

diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 3546e30fb2db12ab3f7bacd3c8ad4cb31b95ea21..4e49075bd0144b653db883ddb3e5649ce7f02850 100644 (file)
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -29,7 +29,7 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
                        param = dojo.doc.createElement('span');
                        param.className = (enabled != false) ? 'labelParam' : 'labelParam Disabled';
                        param.innerHTML = args.item.param[0];
-                       dojo.place(param, tnode.labelNode, 'after');
+                       dojo.place(param, tnode.rowNode, 'first');
                }
 
                return tnode;