Merge "Align "What's this" vertically"

[lhc/web/wiklou.git] / resources / src / mediawiki.legacy / commonPrint.css

diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index dec0fe8..8ff0634 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -131,6 +131,12 @@ pre,
        overflow: auto;
 }
 
+/* Prevent citations and subscripts from interfering with the line-height */
+sup,
+sub {
+       line-height: 1;
+}
+
 ul {
        list-style-type: square;
 }
@@ -197,28 +203,49 @@ ul {
  * Floating divs (and thumbnails)
  */
 /* @noflip */
+table.floatright,
 div.floatright,
 div.tright {
        float: right;
        clear: right;
        position: relative;
-       margin: 0.5em 0 0.8em 1.4em;
-}
-
-div.floatright p {
-       font-style: italic;
 }
 
 /* @noflip */
+table.floatleft,
 div.floatleft,
 div.tleft {
        float: left;
        clear: left;
        position: relative;
-       margin: 0.5em 1.4em 0.8em 0;
 }
 
-div.floatleft p {
+/* @noflip */
+div.tleft {
+       margin: 0.5em 1.4em 1.3em 0;
+}
+
+/* @noflip */
+div.tright {
+       margin: 0.5em 0 1.3em 1.4em;
+}
+
+/* @noflip */
+table.floatright,
+div.floatright {
+       margin: 0 0 0.5em 0.5em;
+       border: 0;
+}
+
+/* @noflip */
+table.floatleft,
+div.floatleft {
+       margin: 0 0.5em 0.5em 0;
+       border: 0;
+}
+
+div.floatleft p,
+div.floatright p {
        font-style: italic;
 }
 
@@ -231,33 +258,31 @@ div.floatleft p {
  */
 div.thumb {
        background-color: transparent;
-       border: 0;
        width: auto;
-       margin-top: 0.5em;
-       margin-bottom: 0.8em;
+}
+
+div.thumb a {
+       border-bottom: 0;
 }
 
 div.thumbinner {
        background-color: #fff;
-       border: 1pt solid #ccc;
-       padding: 3px;
-       font-size: 94%;
+       border: 0;
+       border-radius: 2px;
+       padding: 5px;
+       font-size: 10pt;
+       color: #666;
        text-align: center;
        /* new block formatting context,
         * to clear background from floating content  */
        overflow: hidden;
-}
-
-html .thumbimage {
-       border: 1pt solid #ccc;
+       min-width: 100px;
 }
 
 html .thumbcaption {
-       border: 0;
        text-align: left;
        line-height: 1.4;
        padding: 3px;
-       font-size: 94%;
 }
 
 img.thumbborder {
@@ -266,19 +291,21 @@ img.thumbborder {
 
 /**
  * Table rendering
- * As on shared.css but with white background.
  */
+/* Compare `table.wikitable` in shared.css */
 table.wikitable,
-table.mw_metadata {
+.mw_metadata {
        background: #fff;
        margin: 1em 0;
        border: 1pt solid #aaa;
        border-collapse: collapse;
+       font-size: 10pt;
 }
 
 table.wikitable > caption,
 .mw_metadata caption {
-       font-weight: bold;
+       padding: 5px;
+       font-size: 10pt;
 }
 
 table.wikitable > tr > th,
@@ -287,15 +314,17 @@ table.wikitable > * > tr > th,
 table.wikitable > * > tr > td,
 .mw_metadata th,
 .mw_metadata td {
+       /* Important is required to override any inline styles provided by editors */
+       background: #fff !important; /* stylelint-disable-line declaration-no-important */
+       /* We need to also set color in case editors applied a light text color */
+       color: #000 !important; /* stylelint-disable-line declaration-no-important */
        border: 1pt solid #aaa;
-       padding: 0.2em;
+       padding: 0.4em 0.6em;
 }
 
 table.wikitable > tr > th,
 table.wikitable > * > tr > th,
 .mw_metadata th {
-       background: #fff;
-       font-weight: bold;
        text-align: center;
 }