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

simplify zoom mode display

This commit is contained in:
Andrew Dolgov 2018-12-06 16:42:21 +03:00
parent 26c074ed7e
commit 369bac525b
4 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/article.php
View File

@ -771,7 +771,7 @@ class Article extends Handler_Protected {
/* originally from */ /* originally from */
if ($line["orig_feed_id"]) { if (!$zoom_mode && $line["orig_feed_id"]) {
$of_sth = $pdo->prepare("SELECT * FROM ttrss_archived_feeds $of_sth = $pdo->prepare("SELECT * FROM ttrss_archived_feeds
WHERE id = ? AND owner_uid = ?"); WHERE id = ? AND owner_uid = ?");
@ -813,14 +813,6 @@ class Article extends Handler_Protected {
} }
if ($zoom_mode) {
$rv['content'] .= "
<div class='footer'>
<button onclick=\"return window.close()\">".
__("Close this window")."</button></div>";
$rv['content'] .= "</body></html>";
}
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
$rv['content'] = $p->hook_format_article($rv['content'], $line, $zoom_mode); $rv['content'] = $p->hook_format_article($rv['content'], $line, $zoom_mode);
} }

43
css/default.css
View File

@ -1890,28 +1890,37 @@ body.ttrss_zoom div.post div.header {
font-size: 12px; font-size: 12px;
color: #555; color: #555;
} }
body.ttrss_zoom div.post div.header .author { body.ttrss_zoom div.post div.header .row {
font-size: 11px; display: flex;
margin-bottom: 4px;
flex-wrap: nowrap;
} }
body.ttrss_zoom div.post div.header div.feed-title { body.ttrss_zoom div.post div.header .row > * {
float: left; align-self: center;
}
body.ttrss_zoom div.post div.header .comments {
flex-grow: 2;
}
body.ttrss_zoom div.post div.header .date {
text-align: right; text-align: right;
white-space: nowrap;
align-self: flex-start;
} }
body.ttrss_zoom div.post div.header a.comments { body.ttrss_zoom div.post div.header img,
text-align: right; body.ttrss_zoom div.post div.header i {
} margin: 0px 4px;
body.ttrss_zoom div.post div.header div.date {
float: none;
text-align: right;
margin-bottom: 5px;
}
body.ttrss_zoom div.post div.header div.tags img {
vertical-align: middle; vertical-align: middle;
} }
body.ttrss_zoom div.post div.header div.title { body.ttrss_zoom div.post div.header .title {
white-space: normal; flex-grow: 2;
font-size: 16px; align-self: flex-start;
margin-bottom: 5px; font-size: 15px;
font-weight: 600;
text-rendering: optimizelegibility;
font-family: "Segoe WP Semibold", "Segoe UI Semibold", "Segoe UI Web Semibold", "Segoe UI", Ubuntu, "Helvetica Neue", Helvetica, Arial, sans-serif;
}
body.ttrss_zoom div.post div.header div.feed-title {
text-align: right;
} }
body.ttrss_zoom div.post p { body.ttrss_zoom div.post p {
-webkit-hyphens: auto; -webkit-hyphens: auto;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

59
css/zoom.less
View File

@ -19,38 +19,43 @@ body.ttrss_zoom {
font-size : 12px; font-size : 12px;
color : #555; color : #555;
.author { .row {
font-size : 11px; display : flex;
margin-bottom : 4px;
flex-wrap : nowrap;
> * {
align-self : center;
}
}
.comments {
flex-grow : 2;
}
.date {
text-align : right;
white-space : nowrap;
align-self : flex-start;
}
img, i {
margin : 0px 4px;
vertical-align: middle;
}
.title {
flex-grow : 2;
align-self : flex-start;
font-size : 15px;
font-weight : 600;
text-rendering: optimizelegibility;
font-family : @fonts-ui-bold;
} }
div.feed-title { div.feed-title {
float : left;
text-align : right; text-align : right;
} }
a.comments {
text-align : right;
}
div.date {
float : none;
text-align : right;
margin-bottom : 5px;
}
div.tags {
}
div.tags img {
vertical-align : middle;
}
div.title {
white-space : normal;
font-size : 16px;
margin-bottom : 5px;
}
} }
p { p {