diff options
| -rw-r--r-- | classes/feeds.php | 9 | ||||
| -rw-r--r-- | css/cdm.css | 2 | ||||
| -rw-r--r-- | css/tt-rss.css | 56 |
3 files changed, 40 insertions, 27 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 86a426208..e9ab53e76 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -480,17 +480,18 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; - $reply['content'] .= "<span class=\"hlUpdated\">"; - if (!get_pref('VFEED_GROUP_BY_FEED')) { if (@$line["feed_title"]) { $rgba = @$rgba_cache[$feed_id]; - $reply['content'] .= "<a class=\"hlFeed\" style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">". - truncate_string($line["feed_title"],30)."</a>"; + $reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">". + truncate_string($line["feed_title"],30)."</a></span>"; } } + + $reply['content'] .= "<span class=\"hlUpdated\">"; + $reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div> </span>"; diff --git a/css/cdm.css b/css/cdm.css index 560c68fdd..5de6cd824 100644 --- a/css/cdm.css +++ b/css/cdm.css @@ -199,7 +199,7 @@ div.cdm.active div.cdmContent { span.cdmExcerpt { font-size : 11px; - color : #555; + color : #999; font-weight : normal; cursor : pointer; } diff --git a/css/tt-rss.css b/css/tt-rss.css index 61c1db0d8..29ef021c1 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -223,6 +223,7 @@ a:hover { border-width : 0px 0px 1px 0px; border-style : solid; border-color : #ddd; + padding : 1px; } .hl.active { @@ -390,6 +391,7 @@ span.contentPreview { font-weight : normal; text-shadow : 1px 1px 2px #fff; font-size : 11px; + padding-left : 4px; } span.hlLabelRef { @@ -427,23 +429,6 @@ div.postHeader div { display : none; } -a.hlFeed { - display : block; - white-space : nowrap; - font-size : 9px; - font-style : italic; - font-weight : normal; - display : inline-block; - padding : 1px 2px 1px 2px; - margin-bottom : 2px; - margin-top : 2px; - color : #555; -} - -a.hlFeed:hover { - color : #4684ff; -} - img.markedPic, img.pubPic { cursor : pointer; vertical-align : middle; @@ -597,11 +582,13 @@ div.autocomplete ul li { cursor : pointer; } -.hlTitle { +.hl .hlTitle { overflow : hidden; white-space : nowrap; max-width : 500px; text-overflow : ellipsis; + padding-left : 6px; + padding-right : 6px; } div#headlines-frame.wide .hlTitle { @@ -723,14 +710,39 @@ div.hlRight img { max-height : 16px; } -span.hlUpdated { +.hl span.hlFeed { + display : table-cell; + vertical-align : middle; + text-align : right; +} + +.hl span.hlFeed a { + border-radius : 4px; + display : inline-block; + padding : 1px 4px 1px 4px; + font-size : 11px; + font-style : italic; + font-weight : normal; + color : #555; + white-space : nowrap; +} + +.hl span.hlFeed a:hover { + color : #4684ff; +} + +.hl span.hlUpdated { color : #555; - min-width : 100px; display : table-cell; - width : 100%; vertical-align : middle; text-align : right; - font-size : 10px; + font-size : 11px; + white-space : nowrap; + padding-left : 10px; +} + +span.hlUpdated div { + display : inline-block; } div.hlLeft { |