fix broken highlighting of high-scored rows

3 files changed, 32 insertions, 18 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index aeadcf257..b15875bd3 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -377,9 +377,9 @@ class Feeds extends Handler_Protected {
 					title=\"$score\">";
 
 				if ($score > 500) {
-					$hlc_suffix = "H";
+					$hlc_suffix = "high";
 				} else if ($score < -100) {
-					$hlc_suffix = "L";
+					$hlc_suffix = "low";
 				} else {
 					$hlc_suffix = "";
 				}
@@ -448,8 +448,8 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "</div>";
 
 					$reply['content'] .= "<div onclick='return hlClicked(event, $id)'
-						class=\"hlTitle\"><span class='hlContent$hlc_suffix'>";
-					$reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title\"
+						class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
+					$reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
 						href=\"" . htmlspecialchars($line["link"]) . "\"
 						onclick=\"\">" .
 						truncate_string($line["title"], 200);
@@ -539,7 +539,7 @@ class Feeds extends Handler_Protected {
 
 					$expanded_class = $expand_cdm ? "expanded" : "expandable";
 
-					$reply['content'] .= "<div class=\"cdm $expanded_class $class\"
+					$reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
 						id=\"RROW-$id\" $mouseover_attrs>";
 
 					$reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">";
@@ -556,8 +556,8 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<span id=\"RTITLE-$id\"
 						onclick=\"return cdmClicked(event, $id);\"
-						class=\"titleWrap$hlc_suffix\">
-						<a class=\"title\"
+						class=\"titleWrap $hlc_suffix\">
+						<a class=\"title $hlc_suffix\"
 						target=\"_blank\" href=\"".
 						htmlspecialchars($line["link"])."\">".
 						$line["title"] .
diff --git a/css/cdm.css b/css/cdm.css
index 18bedce01..7e85cbfff 100644
--- a/css/cdm.css
+++ b/css/cdm.css
@@ -265,3 +265,22 @@ div#floatingTitle span.author,
 div#floatingTitle img.tinyFeedIcon {
 	display : none;
 }
+
+.cdm.high .cdmHeader a.title.high, .cdm.high .cdmHeader .cdmExcerpt,
+.cdm.high .cdmHeader span.author {
+	color : #00aa00;
+}
+
+.cdm.Unread.high .cdmHeader a.title.high, .cdm.Unread.high .cdmHeader .cdmExcerpt,
+.cdm.Unread.high .cdmHeader span.author {
+	color : #00dd00;
+}
+
+.cdm .cdmHeader a.title.low, .cdm.low .cdmHeader .cdmExcerpt,
+.cdm.Unread .cdmHeader a.title.low, .cdm.Unread.low .cdmHeader .cdmExcerpt,
+.cdm.low .cdmHeader span.author {
+	color : #909090;
+	text-decoration : line-through;
+}
+
+
diff --git a/css/tt-rss.css b/css/tt-rss.css
index 3e6b8cd38..c5ab8d991 100644
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -606,20 +606,15 @@ div#headlines-frame.wide .hlTitle {
 	white-space : normal;
 }
 
-.hlContentH a, .hlContentH span {
-	color : #00cc00;
+.hl a.title.high, span.hlContent.high .contentPreview {
+	color : #00aa00;
 }
-
-.hlContentL a, .hlContentL span {
-	color : #909090;
-	text-decoration : line-through;
-}
-
-span.titleWrapH, span.titleWrapH a {
-	color : #00cc00;
+.hl.Unread a.title.high, .hl.Unread span.hlContent.high .contentPreview {
+	color : #00dd00;
 }
 
-span.titleWrapL, span.titleWrapL a {
+.hl a.title.low, span.hlContent.low .contentPreview,
+.hl.Unread a.title.low, .hl.Unread span.hlContent.low .contentPreview {
 	color : #909090;
 	text-decoration : line-through;
 }