aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-08-22 23:03:16 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-22 23:03:16 +0200
commit79efca1e6ff28362d4bd2713f68205294cdd07de (patch)
treec20482071f97b5ba0f075d59a9a097b08b26b910 /app/Resources
parent9c545fe028013b30417c1a932cd6b9027bff752d (diff)
parent80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff)
downloadwallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz
wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst
wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/static/themes/baggy/css/ratatouille.css3
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css3
2 files changed, 3 insertions, 3 deletions
diff --git a/app/Resources/static/themes/baggy/css/ratatouille.css b/app/Resources/static/themes/baggy/css/ratatouille.css
index bf89d881..b5aeb54e 100644
--- a/app/Resources/static/themes/baggy/css/ratatouille.css
+++ b/app/Resources/static/themes/baggy/css/ratatouille.css
@@ -63,8 +63,7 @@ pre {
63 max-width: 61.25em; /* 980px */ 63 max-width: 61.25em; /* 980px */
64} 64}
65 65
66table, 66table, img, figure {
67img {
68 max-width: 100%; 67 max-width: 100%;
69 height: auto; 68 height: auto;
70} 69}
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 2ffe0b46..cade37f6 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -436,7 +436,8 @@ main ul.row {
436 max-width: 40em; 436 max-width: 40em;
437} 437}
438 438
439#article img { 439#article img,
440#article figure {
440 max-width: 100%; 441 max-width: 100%;
441 height: auto; 442 height: auto;
442} 443}