summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-16 17:17:55 +0400
committerAndrew Dolgov <[email protected]>2013-03-16 17:17:55 +0400
commite17e99fbcf62f2e347ce771a795be3237521f6b5 (patch)
treed9e8ea837043545573a20a23fe146f6f736fe147
parentd56ec7005e4f903606265fb8857e6438329da60e (diff)
add back vfeed title display, optimize layout; do some layout tweaks on combined mode
-rw-r--r--cdm.css1
-rw-r--r--classes/feeds.php20
-rw-r--r--tt-rss.css21
3 files changed, 16 insertions, 26 deletions
diff --git a/cdm.css b/cdm.css
index dbca58cf5..bdba6c150 100644
--- 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 a3ed951dc..e96aaba30 100644
--- 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 65a3c74b2..0b7e8ec7e 100644
--- 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 {