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 3907a5f..31ca107 100644 (file)
--- a/resources/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -1,61 +1,94 @@
 /*
 ** 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,
 td.diff-ntitle {
        text-align: center;
 }
+
+td.diff-lineno {
+       font-weight: bold;
+}
+
 td.diff-marker {
        text-align: right;
-}
-td.diff-lineno {
        font-weight: bold;
+       font-size: 1.25em;
 }
+
+td.diff-addedline,
+td.diff-deletedline,
+td.diff-context {
+       font-size: 88%;
+       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 {
-       background: #cfc;
-       font-size: smaller;
+       border-color: #a3d3ff;
 }
+
 td.diff-deletedline {
-       background: #ffa;
-       font-size: smaller;
+       border-color: #ffe49c;
 }
+
 td.diff-context {
-       background: #eee;
-       font-size: smaller;
+       background: #f9f9f9;
+       border-color: #e6e6e6;
+       color: #333333;
 }
+
 .diffchange {
-       color: red;
        font-weight: bold;
-       white-space: -moz-pre-wrap;
-       white-space: pre-wrap;
        text-decoration: none;
 }
 
-table.diff {
-       border: none;
-       width: 98%;
-       border-spacing: 4px;
-
-       /* Ensure that colums are of equal width */
-       table-layout: fixed;
-}
-table.diff td {
-       padding: 0;
-}
-table.diff col.diff-marker {
-       width: 2%;
+td.diff-addedline .diffchange,
+td.diff-deletedline .diffchange {
+       border-radius: 0.33em;
+       padding: 0.25em 0;
 }
-table.diff col.diff-content {
-       width: 48%;
+
+td.diff-addedline .diffchange {
+       background: #d8ecff;
 }
-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;
+td.diff-deletedline .diffchange {
+       background: #feeec8;
 }