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

rework some styles related to three panel mode

This commit is contained in:
Andrew Dolgov 2018-11-30 15:54:38 +03:00
parent 8359ca6dad
commit add558e7e5
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/article.php
View File

@ -678,9 +678,9 @@ class Article extends Handler_Protected {
$rv['content'] .= "<body class=\"claro ttrss_utility ttrss_zoom\">"; $rv['content'] .= "<body class=\"claro ttrss_utility ttrss_zoom\">";
} }
$rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">"; $rv['content'] .= "<div class=\"post\" id=\"POST-$id\">";
$rv['content'] .= "<div class=\"postHeader\" id=\"POSTHDR-$id\">"; $rv['content'] .= "<div class=\"header\">";
$entry_author = $line["author"]; $entry_author = $line["author"];
@ -692,25 +692,25 @@ class Article extends Handler_Protected {
$owner_uid, true); $owner_uid, true);
if (!$zoom_mode) if (!$zoom_mode)
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>"; $rv['content'] .= "<div class=\"date\">$parsed_updated</div>";
if ($line["link"]) { if ($line["link"]) {
$rv['content'] .= "<div class='postTitle'><a target='_blank' rel='noopener noreferrer' $rv['content'] .= "<div class='title'><a target='_blank' rel='noopener noreferrer'
title=\"".htmlspecialchars($line['title'])."\" title=\"".htmlspecialchars($line['title'])."\"
href=\"" . href=\"" .
htmlspecialchars($line["link"]) . "\">" . htmlspecialchars($line["link"]) . "\">" .
$line["title"] . "</a>" . $line["title"] . "</a>" .
"<span class='author'>$entry_author</span></div>"; "<span class='author'>$entry_author</span></div>";
} else { } else {
$rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>"; $rv['content'] .= "<div class='title'>" . $line["title"] . "$entry_author</div>";
} }
if ($zoom_mode) { if ($zoom_mode) {
$feed_title = htmlspecialchars($line["feed_title"]); $feed_title = htmlspecialchars($line["feed_title"]);
$rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>"; $rv['content'] .= "<div class=\"feed-title\">$feed_title</div>";
$rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>"; $rv['content'] .= "<div class=\"date\">$parsed_updated</div>";
} }
$tags_str = Article::format_tags_string($line["tags"], $id); $tags_str = Article::format_tags_string($line["tags"], $id);
@ -786,7 +786,7 @@ class Article extends Handler_Protected {
if (!$line['lang']) $line['lang'] = 'en'; if (!$line['lang']) $line['lang'] = 'en';
$rv['content'] .= "<div class=\"postContent\" lang=\"".$line['lang']."\">"; $rv['content'] .= "<div class=\"content\" lang=\"".$line['lang']."\">";
$rv['content'] .= $line["content"]; $rv['content'] .= $line["content"];

2
css/default.css
View File

File diff suppressed because one or more lines are too long

12
css/tt-rss.less
View File

@ -9,17 +9,17 @@ body.ttrss_main {
outline: none; outline: none;
} }
div.postReply { div.post {
padding : 0px; padding : 0px;
div.postHeader { div.header {
padding : 5px; padding : 5px;
color : #909090; color : #909090;
border: 0px solid #ddd; border: 0px solid #ddd;
border-bottom-width: 1px; border-bottom-width: 1px;
background: #f0f0f0; background: #f0f0f0;
div.postDate { div.date {
text-align : right; text-align : right;
float : right; float : right;
} }
@ -35,7 +35,7 @@ body.ttrss_main {
} }
} }
div.postTitle { div.title {
overflow : hidden; overflow : hidden;
font-size : 15px; font-size : 15px;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -45,11 +45,11 @@ body.ttrss_main {
font-family : @fonts-ui-bold; font-family : @fonts-ui-bold;
} }
div.postDate { div.date {
padding-left : 10px; padding-left : 10px;
} }
div.postContent { div.content {
padding : 10px; padding : 10px;
font-size : 16px; font-size : 16px;

10
css/zoom.less
View File

@ -5,7 +5,7 @@ body.ttrss_zoom {
max-width : 800px; max-width : 800px;
background : #f5f5f5; background : #f5f5f5;
div.postHeader { div.header {
margin : 10px; margin : 10px;
padding-bottom : 10px; padding-bottom : 10px;
border: 0px solid #eee; border: 0px solid #eee;
@ -18,7 +18,7 @@ body.ttrss_zoom {
font-size : 11px; font-size : 11px;
} }
div.postFeedTitle { div.feed-title {
float : left; float : left;
text-align : right; text-align : right;
} }
@ -27,7 +27,7 @@ body.ttrss_zoom {
text-align : right; text-align : right;
} }
div.postDate { div.date {
float : none; float : none;
text-align : right; text-align : right;
margin-bottom : 5px; margin-bottom : 5px;
@ -55,7 +55,7 @@ body.ttrss_zoom {
hyphens: auto; hyphens: auto;
} }
div.postReply { div.post {
border : 1px solid #ddd; border : 1px solid #ddd;
background : white; background : white;
box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1); box-shadow : 0px 1px 1px -1px rgba(0,0,0,0.1);
@ -67,7 +67,7 @@ body.ttrss_zoom {
} }
div.postContent { div.content {
font-size : 15px; font-size : 15px;
line-height : 1.5; line-height : 1.5;
padding : 10px; padding : 10px;

2
plugins/embed_original/init.js
View File

@ -12,7 +12,7 @@ function embedOriginalArticle(id) {
if (isCdmMode()) { if (isCdmMode()) {
c = $$("div#RROW-" + id + " div[class=content-inner]")[0]; c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
} else if (id == getActiveArticleId()) { } else if (id == getActiveArticleId()) {
c = $$("div[class=postContent]")[0]; c = $$(".post .content")[0];
} }
if (c) { if (c) {