valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2013-03-16 17:17:55 +04:00
parent d56ec7005e
commit e17e99fbcf
3 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cdm.css
View File

@ -129,4 +129,5 @@ div.cdm.even, div.cdm.odd {
div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a { div.cdmHeader div.hlFeed, div.cdmHeader div.hlFeed a {
vertical-align : middle; vertical-align : middle;
color : gray; color : gray;
font-weight : normal;
} }

24
classes/feeds.php
View File

@ -441,19 +441,18 @@ class Feeds extends Handler_Protected {
$reply['content'] .= $labels_str; $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'] .= "<span class=\"hlFeed\">
(<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a>)
</span>";
}
}
$reply['content'] .= "</div>"; $reply['content'] .= "</div>";
$reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>"; $reply['content'] .= "<span class=\"hlUpdated\">";
if (@$line["feed_title"]) {
$reply['content'] .= "<span class=\"hlFeed\">
<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a><br/>
</span>";
}
$reply['content'] .= "$updated_fmt</span>";
$reply['content'] .= "<div class=\"hlRight\">"; $reply['content'] .= "<div class=\"hlRight\">";
$reply['content'] .= $score_pic; $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'] .= "<span class='updated'>$updated_fmt</span>";
$reply['content'] .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "$score_pic"; $reply['content'] .= "$score_pic";
if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) { if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {

21
tt-rss.css
View File

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