Merge "(bug 34470) Apply explicit margin-left/right according to directionality."

diff --combined skins/common/shared.css
index 02fb501,81df7ac..1b839b5
--- 1/skins/common/shared.css
--- 2/skins/common/shared.css
+++ b/skins/common/shared.css
@@@ -127,20 -127,18 +127,18 @@@ div#mw-js-message 
  }
  
  /* Edit section links */
- .editsection {
-       float: right;
-       margin-left: 5px;
- }
  /* Correct directionality when page dir is different from site/user dir */
+ /* @noflip */
  .mw-content-ltr .editsection,
  .mw-content-rtl .mw-content-ltr .editsection {
-       /* @noflip */
        float: right;
+       margin-left: 5px;
  }
+ /* @noflip */
  .mw-content-rtl .editsection,
  .mw-content-ltr .mw-content-rtl .editsection {
-       /* @noflip */
        float: left;
+       margin-right: 5px;
  }
  
  /**
@@@ -262,22 -260,12 +260,22 @@@ input#wpSummary 
  /**
   * Image captions
   */
 -.thumbcaption {
 +/* @noflip */
 +.mw-content-ltr .thumbcaption {
        text-align: left;
  }
 -.magnify {
 +/* @noflip */
 +.mw-content-rtl .thumbcaption {
 +      text-align: right;
 +}
 +/* @noflip */
 +.mw-content-ltr .magnify {
        float: right;
  }
 +/* @noflip */
 +.mw-content-rtl .magnify {
 +      float: left;
 +}
  
  /**
   * Categories
@@@ -758,6 -746,7 +756,6 @@@ table.mw_metadata ul.metadata-langlist 
  /* Don't forget to update commonPrint.css */
  li.gallerybox {
        vertical-align: top;
 -      border: solid 2px white;
        display: -moz-inline-box;
        display: inline-block;
  }