Fossil SCM
Restore the blue color for changed text in side-by-side diffs.
Commit
00b5e02ab2fdc4c13cbe0fa075fdf655f2b0ab0eb746d19bb121a54281198bfc
Parent
17dde4c75b81ad7…
2 files changed
+10
+10
-2
+10
| --- src/default.css | ||
| +++ src/default.css | ||
| @@ -573,18 +573,28 @@ | ||
| 573 | 573 | td.difftxt del > del { |
| 574 | 574 | background-color: #ffc0c0; |
| 575 | 575 | text-decoration: none; |
| 576 | 576 | font-weight: bold; |
| 577 | 577 | } |
| 578 | +td.difftxt del > del.edit { | |
| 579 | + background-color: #c0c0ff; | |
| 580 | + text-decoration: none; | |
| 581 | + font-weight: bold; | |
| 582 | +} | |
| 578 | 583 | td.difftxt ins { |
| 579 | 584 | background-color: #dafbe1; |
| 580 | 585 | text-decoration: none; |
| 581 | 586 | } |
| 582 | 587 | td.difftxt ins > ins { |
| 583 | 588 | background-color: #a0e4b2; |
| 584 | 589 | text-decoration: none; |
| 585 | 590 | font-weight: bold; |
| 591 | +} | |
| 592 | +td.difftxt ins > ins.edit { | |
| 593 | + background-color: #c0c0ff; | |
| 594 | + text-decoration: none; | |
| 595 | + font-weight: bold; | |
| 586 | 596 | } |
| 587 | 597 | |
| 588 | 598 | |
| 589 | 599 | span.modpending { |
| 590 | 600 | color: #b03800; |
| 591 | 601 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -573,18 +573,28 @@ | |
| 573 | td.difftxt del > del { |
| 574 | background-color: #ffc0c0; |
| 575 | text-decoration: none; |
| 576 | font-weight: bold; |
| 577 | } |
| 578 | td.difftxt ins { |
| 579 | background-color: #dafbe1; |
| 580 | text-decoration: none; |
| 581 | } |
| 582 | td.difftxt ins > ins { |
| 583 | background-color: #a0e4b2; |
| 584 | text-decoration: none; |
| 585 | font-weight: bold; |
| 586 | } |
| 587 | |
| 588 | |
| 589 | span.modpending { |
| 590 | color: #b03800; |
| 591 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -573,18 +573,28 @@ | |
| 573 | td.difftxt del > del { |
| 574 | background-color: #ffc0c0; |
| 575 | text-decoration: none; |
| 576 | font-weight: bold; |
| 577 | } |
| 578 | td.difftxt del > del.edit { |
| 579 | background-color: #c0c0ff; |
| 580 | text-decoration: none; |
| 581 | font-weight: bold; |
| 582 | } |
| 583 | td.difftxt ins { |
| 584 | background-color: #dafbe1; |
| 585 | text-decoration: none; |
| 586 | } |
| 587 | td.difftxt ins > ins { |
| 588 | background-color: #a0e4b2; |
| 589 | text-decoration: none; |
| 590 | font-weight: bold; |
| 591 | } |
| 592 | td.difftxt ins > ins.edit { |
| 593 | background-color: #c0c0ff; |
| 594 | text-decoration: none; |
| 595 | font-weight: bold; |
| 596 | } |
| 597 | |
| 598 | |
| 599 | span.modpending { |
| 600 | color: #b03800; |
| 601 |
+10
-2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -1593,11 +1593,15 @@ | ||
| 1593 | 1593 | int ofst = span.a[i].iStart1; |
| 1594 | 1594 | int len = span.a[i].iLen1; |
| 1595 | 1595 | if( len ){ |
| 1596 | 1596 | htmlize_to_blob(&p->aCol[0], pX->z+x, ofst - x); |
| 1597 | 1597 | x = ofst; |
| 1598 | - blob_append(&p->aCol[0], "<del>", 5); | |
| 1598 | + if( span.a[i].iLen2 ){ | |
| 1599 | + blob_append(&p->aCol[0], "<del class='edit'>", -1); | |
| 1600 | + }else{ | |
| 1601 | + blob_append(&p->aCol[0], "<del>", 5); | |
| 1602 | + } | |
| 1599 | 1603 | htmlize_to_blob(&p->aCol[0], pX->z+x, len); |
| 1600 | 1604 | x += len; |
| 1601 | 1605 | blob_append(&p->aCol[0], "</del>", 6); |
| 1602 | 1606 | } |
| 1603 | 1607 | } |
| @@ -1611,11 +1615,15 @@ | ||
| 1611 | 1615 | int ofst = span.a[i].iStart2; |
| 1612 | 1616 | int len = span.a[i].iLen2; |
| 1613 | 1617 | if( len ){ |
| 1614 | 1618 | htmlize_to_blob(&p->aCol[3], pY->z+x, ofst - x); |
| 1615 | 1619 | x = ofst; |
| 1616 | - blob_append(&p->aCol[3], "<ins>", 5); | |
| 1620 | + if( span.a[i].iLen1 ){ | |
| 1621 | + blob_append(&p->aCol[3], "<ins class='edit'>", -1); | |
| 1622 | + }else{ | |
| 1623 | + blob_append(&p->aCol[3], "<ins>", 5); | |
| 1624 | + } | |
| 1617 | 1625 | htmlize_to_blob(&p->aCol[3], pY->z+x, len); |
| 1618 | 1626 | x += len; |
| 1619 | 1627 | blob_append(&p->aCol[3], "</ins>", 6); |
| 1620 | 1628 | } |
| 1621 | 1629 | } |
| 1622 | 1630 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1593,11 +1593,15 @@ | |
| 1593 | int ofst = span.a[i].iStart1; |
| 1594 | int len = span.a[i].iLen1; |
| 1595 | if( len ){ |
| 1596 | htmlize_to_blob(&p->aCol[0], pX->z+x, ofst - x); |
| 1597 | x = ofst; |
| 1598 | blob_append(&p->aCol[0], "<del>", 5); |
| 1599 | htmlize_to_blob(&p->aCol[0], pX->z+x, len); |
| 1600 | x += len; |
| 1601 | blob_append(&p->aCol[0], "</del>", 6); |
| 1602 | } |
| 1603 | } |
| @@ -1611,11 +1615,15 @@ | |
| 1611 | int ofst = span.a[i].iStart2; |
| 1612 | int len = span.a[i].iLen2; |
| 1613 | if( len ){ |
| 1614 | htmlize_to_blob(&p->aCol[3], pY->z+x, ofst - x); |
| 1615 | x = ofst; |
| 1616 | blob_append(&p->aCol[3], "<ins>", 5); |
| 1617 | htmlize_to_blob(&p->aCol[3], pY->z+x, len); |
| 1618 | x += len; |
| 1619 | blob_append(&p->aCol[3], "</ins>", 6); |
| 1620 | } |
| 1621 | } |
| 1622 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1593,11 +1593,15 @@ | |
| 1593 | int ofst = span.a[i].iStart1; |
| 1594 | int len = span.a[i].iLen1; |
| 1595 | if( len ){ |
| 1596 | htmlize_to_blob(&p->aCol[0], pX->z+x, ofst - x); |
| 1597 | x = ofst; |
| 1598 | if( span.a[i].iLen2 ){ |
| 1599 | blob_append(&p->aCol[0], "<del class='edit'>", -1); |
| 1600 | }else{ |
| 1601 | blob_append(&p->aCol[0], "<del>", 5); |
| 1602 | } |
| 1603 | htmlize_to_blob(&p->aCol[0], pX->z+x, len); |
| 1604 | x += len; |
| 1605 | blob_append(&p->aCol[0], "</del>", 6); |
| 1606 | } |
| 1607 | } |
| @@ -1611,11 +1615,15 @@ | |
| 1615 | int ofst = span.a[i].iStart2; |
| 1616 | int len = span.a[i].iLen2; |
| 1617 | if( len ){ |
| 1618 | htmlize_to_blob(&p->aCol[3], pY->z+x, ofst - x); |
| 1619 | x = ofst; |
| 1620 | if( span.a[i].iLen1 ){ |
| 1621 | blob_append(&p->aCol[3], "<ins class='edit'>", -1); |
| 1622 | }else{ |
| 1623 | blob_append(&p->aCol[3], "<ins>", 5); |
| 1624 | } |
| 1625 | htmlize_to_blob(&p->aCol[3], pY->z+x, len); |
| 1626 | x += len; |
| 1627 | blob_append(&p->aCol[3], "</ins>", 6); |
| 1628 | } |
| 1629 | } |
| 1630 |