Merge "Follow-up I96d2225: Adding white background color to framed images in Parsoid"

diff --combined resources/src/mediawiki.skinning/content.parsoid.less
index 72126f3,8f58d67..f709cff
--- 1/resources/src/mediawiki.skinning/content.parsoid.less
--- 2/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@@ -54,7 -54,7 +54,7 @@@ figure[typeof*='mw:Image'] 
  
        &.mw-halign-right {
                /* @noflip */
 -              margin: .5em 0 1.3em 1.4em;
 +              margin: 0.5em 0 1.3em 1.4em;
                /* @noflip */
                clear: right;
                /* @noflip */
@@@ -63,7 -63,7 +63,7 @@@
  
        &.mw-halign-left {
                /* @noflip */
 -              margin: .5em 1.4em 1.3em 0;
 +              margin: 0.5em 1.4em 1.3em 0;
                /* @noflip */
                clear: left;
                /* @noflip */
@@@ -77,7 -77,7 +77,7 @@@
        }
  
        &.mw-halign-center {
 -              margin: 0 auto .5em auto;
 +              margin: 0 auto 0.5em auto;
                display: table;
                clear: none;
                float: none;
@@@ -118,7 -118,7 +118,7 @@@ figure[typeof~='mw:Image/Frame'] 
        background-color: #f9f9f9;
        // Default to right alignment. This is needed since Parsoid only specifies the
        // alignment class when the alignment is explicitly set.
 -      margin: .5em 0 1.3em 1.4em;
 +      margin: 0.5em 0 1.3em 1.4em;
        clear: right;
        float: right;
  }
@@@ -128,10 -128,9 +128,11 @@@ figure[typeof~='mw:Image/Frame'] > *:fi
  .mw-image-border > *:first-child > img {
        border: 1px solid #ccc;
        margin: 3px;
+       background: #fff;
  }
  
  /* Hide the caption for frameless and plain floated images */
  figure[typeof~="mw:Image/Frameless"] > figcaption,
 -figure[typeof~="mw:Image"] > figcaption { display: none }
 +figure[typeof~="mw:Image"] > figcaption {
 +      display: none;
 +}