diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-07-20 20:44:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-20 20:44:47 +0200 |
commit | 78d17270960fa5211107682fca6a4f7fd6ddc88c (patch) | |
tree | d36ccd90caecabd73212676e1fe601091b9e5058 /src/Wallabag | |
parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
parent | 0e1abf392c6d3cf235e2449c58e9d19d75ed53d7 (diff) | |
download | wallabag-78d17270960fa5211107682fca6a4f7fd6ddc88c.tar.gz wallabag-78d17270960fa5211107682fca6a4f7fd6ddc88c.tar.zst wallabag-78d17270960fa5211107682fca6a4f7fd6ddc88c.zip |
Merge pull request #2198 from Simounet/fix/image-inside-figure
FIX image inside a figure element max-width
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css | 2 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css index b203cbb8..605eb641 100644 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/ratatouille.css | |||
@@ -64,7 +64,7 @@ pre { | |||
64 | max-width: 61.25em;/*980px*/ | 64 | max-width: 61.25em;/*980px*/ |
65 | } | 65 | } |
66 | 66 | ||
67 | table, img { | 67 | table, img, figure { |
68 | max-width: 100%; | 68 | max-width: 100%; |
69 | height :auto; | 69 | height :auto; |
70 | } | 70 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index b106d91a..b4e082d3 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | |||
@@ -345,7 +345,8 @@ main ul.row { | |||
345 | max-width: 40em; | 345 | max-width: 40em; |
346 | } | 346 | } |
347 | 347 | ||
348 | #article img { | 348 | #article img, |
349 | #article figure { | ||
349 | max-width: 100%; | 350 | max-width: 100%; |
350 | height: auto; | 351 | height: auto; |
351 | } | 352 | } |