Merge "Do not mention deprecated RawPage in hooks.txt"

[lhc/web/wiklou.git] / resources / src / mediawiki.skinning / content.parsoid.less

diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less
index 15f53f0..775b249 100644 (file)
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -66,6 +66,7 @@ figure[typeof*='mw:Image'] {
 
        &.mw-halign-center {
                margin: 0 auto .5em auto;
+               display: table;
                clear: none;
                float: none;
        }
@@ -113,6 +114,10 @@ figure[typeof~='mw:Image/Frame'] > *:first-child > img,
        margin: 4px;
 }
 
+/* Hide the caption for frameless and plain floated images */
+figure[typeof~="mw:Image/Frameless"] > figcaption,
+figure[typeof~="mw:Image"] > figcaption { display: none }
+
 /*
  * Finally, some basic styling for Parsoid render testing.
  * Only Parsoid directly sets .mw-body-content directly on the body, so this