| Index: trunk/phase3/docs/uidesign/mediawiki.action.history.diff.html |
| — | — | @@ -3,16 +3,36 @@ |
| 4 | 4 | <head> |
| 5 | 5 | <link rel="stylesheet" href="../../resources/mediawiki.action/mediawiki.action.history.diff.css" /> |
| 6 | 6 | </head> |
| 7 | | -<body> |
| | 7 | +<body style="background-color: #C0C0C0;"> |
| 8 | 8 | <p> |
| 9 | | -This show various styles for our diff action. The reference style sheet is:</p> |
| | 9 | +This show various styles for our diff action, the background being hardcoded to gray (<tt>#C0C0C0</tt>) The reference style sheet is:</p> |
| 10 | 10 | <p> |
| 11 | 11 | <tt><a href="../../resources/mediawiki.action/mediawiki.action.history.diff.css">resources/mediawiki.action/mediawiki.action.history.diff.css</a></tt>. |
| 12 | 12 | </p> |
| 13 | 13 | <p> |
| 14 | 14 | This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.</p> |
| | 15 | + |
| | 16 | +<p> |
| | 17 | +First, show the diff mostly like it would be chown on a wiki</p> |
| 15 | 18 | <table class="diff"> |
| | 19 | +<tr> |
| | 20 | + <td class="diff-marker">-</td> |
| | 21 | + <td class="diff-deletedline"><div> |
| | 22 | + Some content <span class="diffchange diffchange-inline">deleted / replaced</span> |
| | 23 | + </div></td> |
| | 24 | + <td class="diff-marker">+</td> |
| | 25 | + <td class="diff-addedline"><div> |
| | 26 | + Some content <span class="diffchange diffchange-inline">added / replacement</span> |
| | 27 | + </div></td> |
| | 28 | +</tr> |
| | 29 | +</table> |
| 16 | 30 | |
| | 31 | + |
| | 32 | +<p> |
| | 33 | +Below are some basic lines being applied one or two classes. Mainly for debugging purposes</p> |
| | 34 | + |
| | 35 | +<table class="diff"> |
| | 36 | + |
| 17 | 37 | <tr><th>Diff</th></tr> |
| 18 | 38 | |
| 19 | 39 | <tr><td class="diff-addedline"><tt>diff-addedline</tt>: added line</td></tr> |
| — | — | @@ -20,12 +40,18 @@ |
| 21 | 41 | <tr><td class="diff-context"><tt>diff-context</tt>: context</td></tr> |
| 22 | 42 | |
| 23 | 43 | |
| 24 | | - <tr><th>Same as above with <tt>diffchange</tt> class</th></tr> |
| | 44 | + <tr><th>Same as above with a <tt><span></tt> child element having the <tt>diffchange</tt> class</th></tr> |
| 25 | 45 | |
| 26 | 46 | <tr><td class="diffchange">Diffchange</td></tr> |
| 27 | | - <tr><td class="diff-addedline diffchange">Added line + diffchange</td></tr> |
| 28 | | - <tr><td class="diff-deletedline diffchange">Deleted line + diffchange</td></tr> |
| 29 | | - <tr><td class="diff-context diffchange">Context + diffchange</td></tr> |
| | 47 | + <tr><td class="diff-addedline"> |
| | 48 | + <span class="diffchange">Added line + diffchange</span> |
| | 49 | + </td></tr> |
| | 50 | + <tr><td class="diff-deletedline"> |
| | 51 | + <span class="diffchange">Deleted line + diffchange</span> |
| | 52 | + </td></tr> |
| | 53 | + <tr><td class="diff-context"> |
| | 54 | + <span class="diffchange">Context + diffchange</span> |
| | 55 | + </td></tr> |
| 30 | 56 | </table> |
| 31 | 57 | |
| 32 | 58 | </body></html> |