From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- docs/uidesign/mediawiki.action.history.diff.html | 106 +++++++++++++++-------- 1 file changed, 70 insertions(+), 36 deletions(-) (limited to 'docs/uidesign') 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 @@ - + + + - -

-This show various styles for our diff action, the background being hardcoded to gray (#C0C0C0) The reference style sheet is:

-

-resources/mediawiki.action/mediawiki.action.history.diff.css. -

-

-This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.

- -

-First, show the diff mostly like it would be chown on a wiki

- + + +

This show various styles for our diff action. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.css.

+

This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.

+

Try it out in print mode, too. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.print.css.

+ +

Practical example copied from MediaWiki's HTML output:

+ +
+ + + + + + - - + + - + -
-
- Some content deleted / replaced -
−
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 +
- Some content added / replacement -
Lorem ipsum dolor sit amet, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- + + − + +   + + + − +
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+   + + +   + +   + + + +   +
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+   +
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+ + +   + +   + + + + − +
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ + +
Excepteur sint occaecat cupidatat non proident, sunt reprehenderit in voluptate in culpa qui officia deserunt mollit anim.
+ + +   + + + + + +   + + +
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+ + -

-Below are some basic lines being applied one or two classes. Mainly for debugging purposes

+

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

- - - + - - - + +
Diff
diff-addedline: added line
diff-deletedline: deleted line
diff-context: context
Same as above with a <span> child element having the diffchange class
Same as above with a <ins> or <del> child element having the diffchange class:
Diffchange
- Added line + diffchange -
- Deleted line + diffchange -
- Context + diffchange -
Added line + diffchange
Deleted line + diffchange
-- cgit v1.2.3-54-g00ecf