From: Geoffrey T. D. <da...@us...> - 2001-12-13 05:10:07
|
Update of /cvsroot/phpwiki/phpwiki In directory usw-pr-cvs1:/tmp/cvs-serv6353 Modified Files: phpwiki.css Log Message: Refactor diff code: o Code clean-up and refactor. o Split the PhpWiki-independent part of the code into lib/difflib.php. o New CSS-formatted unified diff output replaces old table-heavy format. o Add character-level diffs. Issues: o New CSS-formatted diffs are very ugly in NS4 (and probably other oldish browsers.) o Character-level diffs may be overkill. Maybe back off to word-level diffs? Index: phpwiki.css =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** phpwiki.css 2001/12/11 22:45:38 1.9 --- phpwiki.css 2001/12/13 05:10:04 1.10 *************** *** 225,241 **** margin: 0.5ex 0px; } ! ! .diff-added { ! background: #cfc; ! } ! .diff-deleted { ! background: #fcc; ! } ! .diff-unchanged { ! background: white; ! } ! .diff-notation { ! background: #ccc; ! } /* For emacs users --- 225,250 ---- margin: 0.5ex 0px; } ! ! /* Diff output */ ! .diff .block { ! padding: 0.5ex 0.5em; ! margin: 0.5ex 0; ! border: 0.1px; /* hack for NS4 to get background color filled in whole div */ ! } ! .diff .block tt { font-weight: bold; } ! ! .diff .block div { position: relative; padding-left: 1.5em; } ! .diff .prefix { position: absolute; left: 0.5em; top: 0; } ! ! .diff .block { background: #ccc; } ! ! .diff .context { background: white; } ! .diff .deleted { background: #fee; } ! .diff .added { background: #efe; } ! .diff .changed { background: #ffb; } ! ! .diff del { background: #fbb; font-weight: bold; text-decoration: none; } ! .diff ins { background: #bfb; font-weight: bold; text-decoration: none; } ! /* For emacs users |