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

bring back excerpts in unexpanded mode

This commit is contained in:
Andrew Dolgov 2018-12-02 19:04:53 +03:00
parent f89924f7a1
commit ad1b6f0a86
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/feeds.php
View File

@ -536,9 +536,13 @@ class Feeds extends Handler_Protected {
$tmp_content .= $labels_str; $tmp_content .= $labels_str;
$tmp_content .= "<span class='collapse'> if (!get_pref("CDM_EXPANDED")) {
<img src=\"images/collapse.png\" onclick=\"return Article.cdmCollapseActive(event)\" $tmp_content .= "<span class='collapse'>
title=\"".__("Collapse article")."\"/></span>"; <img src=\"images/collapse.png\" onclick=\"return Article.cdmUnsetActive(event)\"
title=\"" . __("Collapse article") . "\"/></span>";
$tmp_content .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
}
$tmp_content .= "</span>"; $tmp_content .= "</span>";

33
css/cdm.less
View File

@ -103,7 +103,7 @@
margin-top : 4px; margin-top : 4px;
margin-bottom : 4px; margin-bottom : 4px;
.collapse { .collapse, .excerpt {
display : none; display : none;
} }
@ -290,7 +290,7 @@ div#floatingTitle {
color : @default-text; color : @default-text;
} }
.collapse { .collapse, .excerpt {
display : none; display : none;
} }
@ -373,6 +373,15 @@ div#floatingTitle.Unread a.title {
overflow : hidden; overflow : hidden;
max-width : 500px; max-width : 500px;
} }
.excerpt {
white-space : nowrap;
font-size : 11px;
color : #999;
font-weight : normal;
cursor : pointer;
}
} }
.cdm.expandable.Unread { .cdm.expandable.Unread {
@ -410,12 +419,18 @@ div.cdm.expandable.Unread div.header a.title {
color : black; color : black;
} }
div.cdm.expandable.active div.header a.title { div.cdm.expandable.active {
color: @color-link; .excerpt {
font-size: 16px; display: none;
font-weight: 600; }
text-rendering: optimizelegibility;
font-family: @fonts-ui-bold; div.header a.title {
color: @color-link;
font-size: 16px;
font-weight: 600;
text-rendering: optimizelegibility;
font-family: @fonts-ui-bold;
}
} }
div.cdm.expandable:not(.active) { div.cdm.expandable:not(.active) {
@ -424,4 +439,4 @@ div.cdm.expandable:not(.active) {
.content, .collapse { .content, .collapse {
display : none; display : none;
} }
} }

2
css/default.css
View File

File diff suppressed because one or more lines are too long