summaryrefslogtreecommitdiff
path: root/docs/uidesign/mediawiki.action.history.diff.html
blob: 615558f2065b6da42c3f882b1e2bb81e6c98680c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
<!DOCTYPE html>
<html lang="en" dir="ltr">
<head>
	<meta charset="utf-8">
	<link rel="stylesheet" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">
	<link rel="stylesheet" media="print" href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">
</head>
<body>

<p>This show various styles for our diff action. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.css">resources/src/mediawiki.action/mediawiki.action.history.diff.css</a></code>.</p>
<p>This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.</p>
<p>Try it out in print mode, too. Style sheet: <code><a href="../../resources/src/mediawiki.action/mediawiki.action.history.diff.print.css">resources/src/mediawiki.action/mediawiki.action.history.diff.print.css</a></code>.</p>

<p>Practical example copied from MediaWiki's HTML output:</p>

<table class="diff diff-contentalign-left">
	<colgroup><col class="diff-marker">
	<col class="diff-content">
	<col class="diff-marker">
	<col class="diff-content">
	</colgroup>
<tbody>
<tr>
	<td class="diff-marker">−</td>
	<td class="diff-deletedline"><div>Lorem ipsum dolor sit amet<del class="diffchange diffchange-inline">, consectetur adipisicing elit</del>, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div></td>
	<td class="diff-marker">+</td>
	<td class="diff-addedline"><div>Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div></td>
</tr>
<tr>
	<td class="diff-marker">−</td>
	<td class="diff-deletedline"></td>
	<td colspan="2" class="diff-empty">&nbsp;</td>
</tr>
<tr>
	<td class="diff-marker">−</td>
	<td class="diff-deletedline"><div>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div></td>
	<td colspan="2" class="diff-empty">&nbsp;</td>
</tr>
<tr>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"></td>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"></td>
</tr>
<tr>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"><div>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</div></td>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"><div>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</div></td>
</tr>
<tr>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"></td>
	<td class="diff-marker">&nbsp;</td>
	<td class="diff-context"></td>
</tr>
<tr>
	<td class="diff-marker">−</td>
	<td class="diff-deletedline"><div>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim<del class="diffchange diffchange-inline"> id est laborum</del>.</div></td>
	<td class="diff-marker">+</td>
	<td class="diff-addedline"><div>Excepteur sint occaecat cupidatat non proident, sunt<ins class="diffchange diffchange-inline"> reprehenderit in voluptate</ins> in culpa qui officia deserunt mollit anim.</div></td>
</tr>
<tr>
	<td colspan="2" class="diff-empty">&nbsp;</td>
	<td class="diff-marker">+</td>
	<td class="diff-addedline"></td>
</tr>
<tr>
	<td colspan="2" class="diff-empty">&nbsp;</td>
	<td class="diff-marker">+</td>
	<td class="diff-addedline"><div>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div></td>
</tr>
</tbody></table>

<p>Below are some basic lines being applied one or two classes. Mainly for debugging purposes.</p>

<table class="diff">
	<tr><th>Diff</th></tr>

	<tr><td class="diff-addedline"><code>diff-addedline</code>: added line</td></tr>
	<tr><td class="diff-deletedline"><code>diff-deletedline</code>: deleted line</td></tr>
	<tr><td class="diff-context"><code>diff-context</code>: context</td></tr>

	<tr><th>Same as above with a <code>&lt;ins&gt;</code> or <code>&lt;del&gt;</code> child element having the <code>diffchange</code> class:</th></tr>

	<tr><td class="diffchange">Diffchange</td></tr>
	<tr><td class="diff-addedline"><ins class="diffchange">Added line + diffchange</ins></td></tr>
	<tr><td class="diff-deletedline"><del class="diffchange">Deleted line + diffchange</del></td></tr>
</table>

</body>
</html>