From 33e2d26bcbef0128fa2b95f0f89580289adc2de2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 7 Jun 2013 10:01:11 +0400
Subject: [PATCH] apply special feedTree styles only to main UI feedtree, fix
 feedParam and filterParam screwing with tree node layout

---
 css/tt-rss.css       | 12 ++++++------
 js/PrefFeedTree.js   |  3 ++-
 js/PrefFilterTree.js |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/css/tt-rss.css b/css/tt-rss.css
index d88fa0aa3..a64e59850 100644
--- 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 942793c76..bf21baa90 100644
--- 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 3546e30fb..4e49075bd 100644
--- 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;