Merge remote-tracking branch 'origin/master' into 2.1

2016-08-22 23:03:16 +02:00
parent 9c545fe028 80bb0b7344
commit 79efca1e6f
45 changed files with 494 additions and 153 deletions
--- 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 {
  max-width: 40em;
 }

-#article img {
+#article img,
+#article figure {
  max-width: 100%;
  height: auto;
 }