From d56ec7005e4f903606265fb8857e6438329da60e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 16 Mar 2013 16:59:31 +0400
Subject: cdm: fix alignment of feed title in vfeeds

---
 cdm.css           |  5 +++++
 classes/feeds.php | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/cdm.css b/cdm.css
index bdbe151b7..dbca58cf5 100644
--- a/cdm.css
+++ b/cdm.css
@@ -125,3 +125,8 @@ div.cdm.even.Unread, div.cdm.odd.Unread {
 div.cdm.even, div.cdm.odd {
 	background : #f0f0f0;
 }
+
+div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
+	vertical-align : middle;
+	color : gray;
+}
diff --git a/classes/feeds.php b/classes/feeds.php
index 62142b47c..a3ed951dc 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -542,15 +542,6 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= $labels_str;
 
-					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
-						if (@$line["feed_title"]) {
-							$reply['content'] .= "<span class=\"hlFeed\">
-								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-								$line["feed_title"]."</a>
-							</span>";
-						}
-					}
-
 					if (!$expand_cdm)
 						$content_hidden = "style=\"display : none\"";
 					else
@@ -561,6 +552,15 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "</span>";
 
+					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+						if (@$line["feed_title"]) {
+							$reply['content'] .= "<div class=\"hlFeed\">
+								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								$line["feed_title"]."</a>
+							</div>";
+						}
+					}
+
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 					$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
 					$reply['content'] .= "$score_pic";
-- 
cgit v1.2.3