add back vfeed title display, optimize layout; do some layout tweaks on combined...

diff --git a/cdm.css b/cdm.css
index dbca58cf5b7b74d9cce6ab630efd32ee208b09e5..bdba6c1508ace9a8e200768d1501e55195061e0a 100644 (file)
--- a/cdm.css
+++ b/cdm.css
@@ -129,4 +129,5 @@ div.cdm.even, div.cdm.odd {
 div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
        vertical-align : middle;
        color : gray;
+       font-weight : normal;
 }

diff --git a/classes/feeds.php b/classes/feeds.php
index a3ed951dcf26370c0dad92f21f10ad9e873a9737..e96aaba30cbde6d8e34c09f42e002a6e4ecaadd1 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -441,19 +441,18 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= $labels_str;
 
-                                       if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
-                                               defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-                                               if (@$line["feed_title"]) {
+                                       $reply['content'] .= "</div>";
+
+                                       $reply['content'] .= "<span class=\"hlUpdated\">";
+
+                                       if (@$line["feed_title"]) {
                                                        $reply['content'] .= "<span class=\"hlFeed\">
-                                                               (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-                                                               $line["feed_title"]."</a>)
+                                                               <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+                                                               $line["feed_title"]."</a><br/>
                                                        </span>";
                                                }
-                                       }
 
-                                       $reply['content'] .= "</div>";
-
-                                       $reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
+                                       $reply['content'] .= "$updated_fmt</span>";
                                        $reply['content'] .= "<div class=\"hlRight\">";
 
                                        $reply['content'] .= $score_pic;
@@ -561,8 +560,9 @@ class Feeds extends Handler_Protected {
                                                }
                                        }
 
-                                       $reply['content'] .= "<div style=\"vertical-align : middle\">";
                                        $reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+
+                                       $reply['content'] .= "<div style=\"vertical-align : middle\">";
                                        $reply['content'] .= "$score_pic";
 
                                        if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {

diff --git a/tt-rss.css b/tt-rss.css
index 65a3c74b2e58770d89c9c968dfdcd59a972c1a3f..0b7e8ec7e22f88b801ca47255adddfdfc5abe6ef 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -559,11 +559,6 @@ span.hlLabelRef {
        white-space: nowrap;
 }
 
-td.hlSelectRow, td.hlUpdPic {
-       width : 25px;
-       text-align : center;
-}
-
 div.postHeader div.postDate {
        text-align : right;
        color : gray;
@@ -588,17 +583,11 @@ div.postHeader div {
        display : none;
 }
 
-td.hlMarkedPic, td.hlSelectRow, td.hlUpdated, td.hlFeed {
-       height : 1em;
-}
-
-td.hlFeed {
-       text-align : right;
-}
-
 span.hlFeed, span.hlFeed a {
-       font-size : 12px;
+       font-size : 10px;
        color : gray;
+       font-style : italic;
+       font-weight : normal;
 }
 
 span.hlFeed a:hover {
@@ -1017,9 +1006,9 @@ span.hlUpdated {
        display : table-cell;
        width : 100%;
        vertical-align : middle;
-       padding-top : 4px;
-       padding-bottom : 4px;
        text-align : right;
+       font-size : 10px;
+       font-weight : normal;
 }
 
 div.hlLeft {