summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-07-12 01:29:50 +0300
committerAndrew Dolgov <[email protected]>2015-07-12 01:29:50 +0300
commit1727ceabca4e1d71cb5412946fcd94c3e3ea6196 (patch)
tree19b6df081af9de518882f4864cd00481340a9281
parentf5a0fb8b64c57e98fcf73369cb4dbb1b31620fd7 (diff)
parentb9bd7ec55532d35c5a8f125ee001c08afb19c91c (diff)
Merge branch 'master' of git.fakecake.org:tt-rss
-rw-r--r--css/cdm.css1
-rw-r--r--css/tt-rss.css1
-rw-r--r--plugins/af_redditimgur/init.php2
3 files changed, 3 insertions, 1 deletions
diff --git a/css/cdm.css b/css/cdm.css
index 516242bdb..0af07076f 100644
--- a/css/cdm.css
+++ b/css/cdm.css
@@ -264,6 +264,7 @@ div.cdmContentInner p {
div.cdmContentInner iframe {
min-width : 50%;
+ max-width : 98%;
}
div.cdmHeader span.author {
diff --git a/css/tt-rss.css b/css/tt-rss.css
index 97f787c81..38c255950 100644
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -1012,6 +1012,7 @@ div.postContent p {
div.postContent iframe {
min-width : 50%;
+ max-width : 98%;
}
div.postHeader span.author {
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index fd7502203..2b71a8e9d 100644
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -190,7 +190,7 @@ class Af_RedditImgur extends Plugin {
if (!in_array($aentry->getAttribute("content"), $urls)) {
$img = $doc->createElement('img');
- $img->setAttribute("src", $aentry->getAttribute("content"));
+ $img->setAttribute("src", str_replace("?fb", "", $aentry->getAttribute("content")));
$entry->parentNode->insertBefore($doc->createElement('br'), $entry);
$br = $doc->createElement('br');