public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 03:15:56 +00:00
Code Issues Releases Wiki Activity

various layout fixes related to inline player causing unnecessary left padding if shorten_expanded is enabled

Browse Source
This commit is contained in:
Andrew Dolgov
2018-12-07 23:20:19 +03:00
parent 8c905ca020
commit 33240b7fd9
7 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
css/cdm.less
View File

@@ -68,6 +68,7 @@
.intermediate { .intermediate {
margin-top : 10px; margin-top : 10px;
margin-left : 10px;
} }
.content-inner { .content-inner {

10
css/default.css
View File

@@ -80,6 +80,15 @@ body.ttrss_main div.post div.content iframe {
min-width: 50%; min-width: 50%;
max-width: 98%; max-width: 98%;
} }
body.ttrss_main .inline-player {
display: flex;
}
body.ttrss_main .inline-player > * {
align-self: center;
}
body.ttrss_main .inline-player audio {
margin-right: 8px;
}
body.ttrss_main .article-note { body.ttrss_main .article-note {
background-color: #fff7d5; background-color: #fff7d5;
margin: 5px; margin: 5px;
@@ -1095,6 +1104,7 @@ video::-webkit-media-controls-overlay-play-button {
} }
.cdm .intermediate { .cdm .intermediate {
margin-top: 10px; margin-top: 10px;
margin-left: 10px;
} }
.cdm .content-inner { .cdm .content-inner {
margin: 10px; margin: 10px;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

12
css/tt-rss.less
View File

@@ -81,6 +81,18 @@ body.ttrss_main {
} }
} }
.inline-player {
display : flex;
> * {
align-self : center;
}
audio {
margin-right : 8px;
}
}
.article-note { .article-note {
background-color : #fff7d5; background-color : #fff7d5;
margin : 5px; margin : 5px;

8
include/controls.php
View File

@@ -286,18 +286,22 @@ function format_inline_player($url, $ctype) {
if (strpos($ctype, "audio/") === 0) { if (strpos($ctype, "audio/") === 0) {
$entry .= "<div class='inline-player'>";
if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false || if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
$_SESSION["hasMp3"])) { $_SESSION["hasMp3"])) {
$entry .= "<audio preload=\"none\" controls> $entry .= "<audio preload=\"none\" controls>
<source type=\"$ctype\" src=\"$url\"/> <source type=\"$ctype\" src=\"$url\"/>
</audio>"; </audio> ";
} }
if ($entry) $entry .= "&nbsp; <a target=\"_blank\" rel=\"noopener noreferrer\" if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
href=\"$url\">" . basename($url) . "</a>"; href=\"$url\">" . basename($url) . "</a>";
$entry .= "</div>";
return $entry; return $entry;
} }

10
themes/night.css
View File

@@ -80,6 +80,15 @@ body.ttrss_main div.post div.content iframe {
min-width: 50%; min-width: 50%;
max-width: 98%; max-width: 98%;
} }
body.ttrss_main .inline-player {
display: flex;
}
body.ttrss_main .inline-player > * {
align-self: center;
}
body.ttrss_main .inline-player audio {
margin-right: 8px;
}
body.ttrss_main .article-note { body.ttrss_main .article-note {
background-color: #fff7d5; background-color: #fff7d5;
margin: 5px; margin: 5px;
@@ -1095,6 +1104,7 @@ video::-webkit-media-controls-overlay-play-button {
} }
.cdm .intermediate { .cdm .intermediate {
margin-top: 10px; margin-top: 10px;
margin-left: 10px;
} }
.cdm .content-inner { .cdm .content-inner {
margin: 10px; margin: 10px;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long