Merge "Add oldRev parameter to DiffRevisionTools hook"

[lhc/web/wiklou.git] / resources / mediawiki.action / mediawiki.action.history.diff.css

diff --git a/resources/mediawiki.action/mediawiki.action.history.diff.css b/resources/mediawiki.action/mediawiki.action.history.diff.css
index edd69c3..31ca107 100644 (file)
--- a/resources/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -1,8 +1,36 @@
 /*
 ** Diff rendering
 */
-table.diff, td.diff-otitle, td.diff-ntitle {
+table.diff {
        background-color: white;
+       border: none;
+       border-spacing: 4px;
+       margin: 0;
+       width: 100%;
+       /* Ensure that colums are of equal width */
+       table-layout: fixed;
+}
+
+table.diff td {
+       padding: 0.33em 0.5em;
+}
+
+table.diff td.diff-marker {
+       /* Compensate padding for increased font-size */
+       padding: 0.25em;
+}
+
+table.diff col.diff-marker {
+       width: 2%;
+}
+
+table.diff col.diff-content {
+       width: 48%;
+}
+
+table.diff td div {
+       /* Force-wrap very long lines such as URLs or page-widening char strings */
+       word-wrap: break-word;
 }
 
 td.diff-otitle,
@@ -10,14 +38,14 @@ td.diff-ntitle {
        text-align: center;
 }
 
-td.diff-marker {
-       text-align: right;
+td.diff-lineno {
        font-weight: bold;
-       font-size: 1.25em;
 }
 
-td.diff-lineno {
+td.diff-marker {
+       text-align: right;
        font-weight: bold;
+       font-size: 1.25em;
 }
 
 td.diff-addedline,
@@ -27,20 +55,22 @@ td.diff-context {
        vertical-align: top;
        white-space: -moz-pre-wrap;
        white-space: pre-wrap;
+       border-style: solid;
+       border-width: 1px 1px 1px 4px;
+       border-radius: 0.33em;
 }
 
 td.diff-addedline {
-       border: solid 4px #a3d3ff;
-       border-radius: 0.33em;
+       border-color: #a3d3ff;
 }
 
 td.diff-deletedline {
-       border: solid 4px #ffe49c;
-       border-radius: 0.33em;
+       border-color: #ffe49c;
 }
 
 td.diff-context {
-       background: #F2F2F2;
+       background: #f9f9f9;
+       border-color: #e6e6e6;
        color: #333333;
 }
 
@@ -49,51 +79,16 @@ td.diff-context {
        text-decoration: none;
 }
 
-table.diff {
-       border: none;
-       width: 98%;
-       border-spacing: 4px;
-
-       /* Ensure that colums are of equal width */
-       table-layout: fixed;
+td.diff-addedline .diffchange,
+td.diff-deletedline .diffchange {
+       border-radius: 0.33em;
+       padding: 0.25em 0;
 }
 
 td.diff-addedline .diffchange {
-       background: #eaf5ff;
-       padding: 0.125em 0.25em;
-       border: solid 1px #5698d6;
-       border-top: none;
-       border-bottom: none;
-       border-radius: 0.33em;
+       background: #d8ecff;
 }
 
 td.diff-deletedline .diffchange {
        background: #feeec8;
-       padding: 0.125em 0.25em;
-       border: solid 1px #e0b141;
-       border-top: none;
-       border-bottom: none;
-       border-radius: 0.33em;
-}
-
-table.diff td {
-       padding: 0.33em 0.66em;
-}
-
-table.diff col.diff-marker {
-       width: 2%;
-}
-
-table.diff col.diff-content {
-       width: 48%;
-}
-
-table.diff td div {
-       /* Force-wrap very long lines such as URLs or page-widening char strings.*/
-       word-wrap: break-word;
-
-       /* As fallback (FF<3.5, Opera <10.5), scrollbars will be added for very wide cells
-          instead of text overflowing or widening
-       */
-       overflow: auto;
 }