From d383f5a5e898f0d2bbd17f5ca5cc2193da08462d Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Tue, 6 Dec 2011 09:35:24 +0000 Subject: [PATCH] uidesign: fix diffchange, show basic diff just like on wiki --- .../mediawiki.action.history.diff.html | 38 ++++++++++++++++--- 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/docs/uidesign/mediawiki.action.history.diff.html b/docs/uidesign/mediawiki.action.history.diff.html index d7dd3f6141..fdc54aa3cc 100644 --- a/docs/uidesign/mediawiki.action.history.diff.html +++ b/docs/uidesign/mediawiki.action.history.diff.html @@ -3,14 +3,34 @@ - +

-This show various styles for our diff action. The reference style sheet is:

+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

+ + + + + + + +
-
+ Some content deleted / replaced +
+
+ Some content added / replacement +
+ + +

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

+ @@ -20,12 +40,18 @@ This file might help us fix our diff colors which have been a recurring issues a - + - - - + + +
Diff
diff-context: context
Same as above with diffchange class
Same as above with a <span> child element having the diffchange class
Diffchange
Added line + diffchange
Deleted line + diffchange
Context + diffchange
+ Added line + diffchange +
+ Deleted line + diffchange +
+ Context + diffchange +
-- 2.20.1