diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /docs/uidesign | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'docs/uidesign')
| -rw-r--r-- | docs/uidesign/mediawiki.action.history.diff.html | 106 |
1 files changed, 70 insertions, 36 deletions
diff --git a/docs/uidesign/mediawiki.action.history.diff.html b/docs/uidesign/mediawiki.action.history.diff.html index 5edcfb86..615558f2 100644 --- a/docs/uidesign/mediawiki.action.history.diff.html +++ b/docs/uidesign/mediawiki.action.history.diff.html @@ -1,57 +1,91 @@ <!DOCTYPE html> <html lang="en" dir="ltr"> <head> - <link rel="stylesheet" href="../../resources/mediawiki.action/mediawiki.action.history.diff.css"> + <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 style="background-color: #C0C0C0;"> -<p> -This show various styles for our diff action, the background being hardcoded to gray (<code>#C0C0C0</code>) The reference style sheet is:</p> -<p> -<code><a href="../../resources/mediawiki.action/mediawiki.action.history.diff.css">resources/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> -First, show the diff mostly like it would be chown on a wiki</p> -<table class="diff"> +<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> - Some content <span class="diffchange diffchange-inline">deleted / replaced</span> - </div></td> + <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> - Some content <span class="diffchange diffchange-inline">added / replacement</span> - </div></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> -</table> - +<tr> + <td class="diff-marker">−</td> + <td class="diff-deletedline"></td> + <td colspan="2" class="diff-empty"> </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"> </td> +</tr> +<tr> + <td class="diff-marker"> </td> + <td class="diff-context"></td> + <td class="diff-marker"> </td> + <td class="diff-context"></td> +</tr> +<tr> + <td class="diff-marker"> </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"> </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"> </td> + <td class="diff-context"></td> + <td class="diff-marker"> </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"> </td> + <td class="diff-marker">+</td> + <td class="diff-addedline"></td> +</tr> +<tr> + <td colspan="2" class="diff-empty"> </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> +<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><span></code> child element having the <code>diffchange</code> class</th></tr> + <tr><th>Same as above with a <code><ins></code> or <code><del></code> child element having the <code>diffchange</code> class:</th></tr> <tr><td class="diffchange">Diffchange</td></tr> - <tr><td class="diff-addedline"> - <span class="diffchange">Added line + diffchange</span> - </td></tr> - <tr><td class="diff-deletedline"> - <span class="diffchange">Deleted line + diffchange</span> - </td></tr> - <tr><td class="diff-context"> - <span class="diffchange">Context + diffchange</span> - </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> |