diff options
-rwxr-xr-x | classes/pref/feeds.php | 1 | ||||
-rw-r--r-- | css/dijit.css | 4 | ||||
-rw-r--r-- | css/tt-rss.css | 21 | ||||
-rw-r--r-- | js/FeedTree.js | 1 |
4 files changed, 19 insertions, 8 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 6795236d5..faef0900f 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1411,6 +1411,7 @@ class Pref_Feeds extends Handler_Protected { <div dojoType=\"fox.PrefFeedTree\" id=\"feedTree\" dndController=\"dijit.tree.dndSource\" betweenThreshold=\"5\" + autoExpand='true' model=\"feedModel\" openOnClick=\"false\"> <script type=\"dojo/method\" event=\"onClick\" args=\"item\"> var id = String(item.id); diff --git a/css/dijit.css b/css/dijit.css index 68a426e3c..dc8b40a6a 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -94,10 +94,6 @@ background : white; } -.claro #feedTree.dijitTree .dijitTreeRowSelected { - box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1); -} - .claro .dijitTree .dijitTreeRowHover { background : #f0f0f0; border-color : #ddd; diff --git a/css/tt-rss.css b/css/tt-rss.css index 5003816b2..1604ba78a 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -1057,18 +1057,28 @@ span.sel_links { vertical-align : middle; } -#feedTree img.feedIcon { +/*#feedTree img.feedIcon { position : relative; top : -2px; +}*/ + +body#ttrssMain.claro #feedTree.dijitTree .dijitTreeNode .dijitTreeRowSelected { + box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1); + border-right-color : white; } -body#ttrssMain #feedTree .dijitTreeRow { +body#ttrssMain #feedTree.dijitTree .dijitTreeNode .dijitTreeRow { padding : 2px 0px 2px; height : 22px; border-width : 1px; color : #333; } +body#ttrssMain #feedTree.dijitTree img.tinyFeedIcon { + position : relative; + top : -2px; +} + ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox { margin-right : 5px; } @@ -1106,11 +1116,14 @@ body#ttrssMain #feedTree .counterNode { height : 14px; } -#feedTree img[src*='indicator_white.gif'] { +body#ttrssMain #feedTree .dijitTreeNode .loadingExpando { + left : -3px; + height : 22px; position : relative; - top : -2px; + top : -3px; } + span.highlight { background-color : #ffff00; color : #cc90cc; diff --git a/js/FeedTree.js b/js/FeedTree.js index 320f99264..a78537fea 100644 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -386,6 +386,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"] } else { var icon = dojo.doc.createElement('img'); icon.src = src; + icon.className = 'loadingExpando'; domConstruct.place(icon, treeNode.expandoNode, 'only'); return true; } |