Fossil SCM

Updated styles/skins. Built-in skin 4 can now wrap lines.

jan 2011-10-16 00:14 jan-sbsdiff
Commit 1c40493cb5cdae60cd1f3d640204e05ce09cdd17
Parent 286f09508ca4998…
3 files changed +12 -10 +23 -10 +16
~ src/diff.c ~ src/skins.c ~ src/style.c
M src/diff.c
+12 -10
--- src/diff.c
+++ src/diff.c
@@ -683,16 +683,18 @@
683683
 continue;
684684
 @ <tr style="display:none;">
685685
 }
686686
687687
 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
688
- @ <td class="lineno">%d(iFrom+j+1)</td><td>%h(linebuf)</td>
688
+ @ <td class="lineno">%d(iFrom+j+1)</td>
689
+ @ <td class="srcline">%h(linebuf)</td>
689690
690691
 @ <td> </td>
691692
692693
 copylimline(linebuf, &c.aTo[iTo+j], collim);
693
- @ <td class="lineno">%d(iTo+j+1)</td><td>%h(linebuf)</td>
694
+ @ <td class="lineno">%d(iTo+j+1)</td>
695
+ @ <td class="srcline">%h(linebuf)</td>
694696
695697
 @ </tr>
696698
 }
697699
 iFrom+=c.aEdit[i];
698700
 iTo+=c.aEdit[i];
@@ -707,23 +709,23 @@
707709
 @ <tr>
708710
709711
 if( j<c.aEdit[i+1] ){
710712
 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
711713
 @ <td class="changed lineno">%d(iFrom+j+1)</td>
712
- @ <td class="changed">%h(linebuf)</td>
714
+ @ <td class="changed srcline">%h(linebuf)</td>
713715
 }else{
714
- @ <td colspan="2"/>
716
+ @ <td colspan="2" class="changedvoid"/>
715717
 }
716718
717719
 @ <td class="changed">|</td>
718720
719721
 if( j<c.aEdit[i+2] ){
720722
 copylimline(linebuf, &c.aTo[iTo+j], collim);
721723
 @ <td class="changed lineno">%d(iTo+j+1)</td>
722
- @ <td class="changed">%h(linebuf)</td>
724
+ @ <td class="changed srcline">%h(linebuf)</td>
723725
 }else{
724
- @ <td colspan="2"/>
726
+ @ <td colspan="2" class="changedvoid"/>
725727
 }
726728
727729
 @ </tr>
728730
 }
729731
 iFrom+=c.aEdit[i+1];
@@ -735,31 +737,31 @@
735737
 int len;
736738
 @ <tr>
737739
738740
 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
739741
 @ <td class="removed lineno">%d(iFrom+j+1)</td>
740
- @ <td class="removed">%h(linebuf)</td>
742
+ @ <td class="removed srcline">%h(linebuf)</td>
741743
742744
 @ <td>&lt;</td>
743745
744
- @ <td colspan="2"/>
746
+ @ <td colspan="2" class="removedvoid"/>
745747
746748
 @ </tr>
747749
 }
748750
 iFrom+=c.aEdit[i+1];
749751
750752
 /* Process inserted lines */
751753
 for( j=0; j<c.aEdit[i+2]; j++ ){
752754
 int len;
753755
 @ <tr>
754
- @ <td colspan="2"/>
756
+ @ <td colspan="2" class="addedvoid"/>
755757
756758
 @ <td>&gt;</td>
757759
758760
 copylimline(linebuf, &c.aTo[iTo+j], collim);
759761
 @ <td class="added lineno">%d(iTo+j+1)</td>
760
- @ <td class="added">%h(linebuf)</td>
762
+ @ <td class="added srcline">%h(linebuf)</td>
761763
762764
 @ </tr>
763765
 }
764766
 iTo+=c.aEdit[i+2];
765767
 }
766768
--- src/diff.c
+++ src/diff.c
@@ -683,16 +683,18 @@
683 continue;
684 @ <tr style="display:none;">
685 }
686
687 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
688 @ <td class="lineno">%d(iFrom+j+1)</td><td>%h(linebuf)</td>
 
689
690 @ <td> </td>
691
692 copylimline(linebuf, &c.aTo[iTo+j], collim);
693 @ <td class="lineno">%d(iTo+j+1)</td><td>%h(linebuf)</td>
 
694
695 @ </tr>
696 }
697 iFrom+=c.aEdit[i];
698 iTo+=c.aEdit[i];
@@ -707,23 +709,23 @@
707 @ <tr>
708
709 if( j<c.aEdit[i+1] ){
710 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
711 @ <td class="changed lineno">%d(iFrom+j+1)</td>
712 @ <td class="changed">%h(linebuf)</td>
713 }else{
714 @ <td colspan="2"/>
715 }
716
717 @ <td class="changed">|</td>
718
719 if( j<c.aEdit[i+2] ){
720 copylimline(linebuf, &c.aTo[iTo+j], collim);
721 @ <td class="changed lineno">%d(iTo+j+1)</td>
722 @ <td class="changed">%h(linebuf)</td>
723 }else{
724 @ <td colspan="2"/>
725 }
726
727 @ </tr>
728 }
729 iFrom+=c.aEdit[i+1];
@@ -735,31 +737,31 @@
735 int len;
736 @ <tr>
737
738 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
739 @ <td class="removed lineno">%d(iFrom+j+1)</td>
740 @ <td class="removed">%h(linebuf)</td>
741
742 @ <td>&lt;</td>
743
744 @ <td colspan="2"/>
745
746 @ </tr>
747 }
748 iFrom+=c.aEdit[i+1];
749
750 /* Process inserted lines */
751 for( j=0; j<c.aEdit[i+2]; j++ ){
752 int len;
753 @ <tr>
754 @ <td colspan="2"/>
755
756 @ <td>&gt;</td>
757
758 copylimline(linebuf, &c.aTo[iTo+j], collim);
759 @ <td class="added lineno">%d(iTo+j+1)</td>
760 @ <td class="added">%h(linebuf)</td>
761
762 @ </tr>
763 }
764 iTo+=c.aEdit[i+2];
765 }
766
--- src/diff.c
+++ src/diff.c
@@ -683,16 +683,18 @@
683 continue;
684 @ <tr style="display:none;">
685 }
686
687 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
688 @ <td class="lineno">%d(iFrom+j+1)</td>
689 @ <td class="srcline">%h(linebuf)</td>
690
691 @ <td> </td>
692
693 copylimline(linebuf, &c.aTo[iTo+j], collim);
694 @ <td class="lineno">%d(iTo+j+1)</td>
695 @ <td class="srcline">%h(linebuf)</td>
696
697 @ </tr>
698 }
699 iFrom+=c.aEdit[i];
700 iTo+=c.aEdit[i];
@@ -707,23 +709,23 @@
709 @ <tr>
710
711 if( j<c.aEdit[i+1] ){
712 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
713 @ <td class="changed lineno">%d(iFrom+j+1)</td>
714 @ <td class="changed srcline">%h(linebuf)</td>
715 }else{
716 @ <td colspan="2" class="changedvoid"/>
717 }
718
719 @ <td class="changed">|</td>
720
721 if( j<c.aEdit[i+2] ){
722 copylimline(linebuf, &c.aTo[iTo+j], collim);
723 @ <td class="changed lineno">%d(iTo+j+1)</td>
724 @ <td class="changed srcline">%h(linebuf)</td>
725 }else{
726 @ <td colspan="2" class="changedvoid"/>
727 }
728
729 @ </tr>
730 }
731 iFrom+=c.aEdit[i+1];
@@ -735,31 +737,31 @@
737 int len;
738 @ <tr>
739
740 copylimline(linebuf, &c.aFrom[iFrom+j], collim);
741 @ <td class="removed lineno">%d(iFrom+j+1)</td>
742 @ <td class="removed srcline">%h(linebuf)</td>
743
744 @ <td>&lt;</td>
745
746 @ <td colspan="2" class="removedvoid"/>
747
748 @ </tr>
749 }
750 iFrom+=c.aEdit[i+1];
751
752 /* Process inserted lines */
753 for( j=0; j<c.aEdit[i+2]; j++ ){
754 int len;
755 @ <tr>
756 @ <td colspan="2" class="addedvoid"/>
757
758 @ <td>&gt;</td>
759
760 copylimline(linebuf, &c.aTo[iTo+j], collim);
761 @ <td class="added lineno">%d(iTo+j+1)</td>
762 @ <td class="added srcline">%h(linebuf)</td>
763
764 @ </tr>
765 }
766 iTo+=c.aEdit[i+2];
767 }
768
M src/skins.c
+23 -10
--- src/skins.c
+++ src/skins.c
@@ -1021,49 +1021,62 @@
10211021
 @ }
10221022
 @
10231023
 @ /* Side-by-side diff */
10241024
 @ table.sbsdiff {
10251025
 @ background-color: white;
1026
-@ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
1027
-@ font-size: 9pt;
1026
+@ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
1027
+@ font-size: 8pt;
10281028
 @ border-collapse:collapse;
1029
-@ white-space: pre;
10301029
 @ width: 98%;
10311030
 @ border: 1px #000 dashed;
1031
+@ margin-left: auto;
1032
+@ margin-right: auto;
10321033
 @ }
1033
-@
1034
+@
10341035
 @ table.sbsdiff th.diffhdr {
10351036
 @ border-bottom: dotted;
10361037
 @ border-width: 1px;
10371038
 @ }
1038
-@
1039
+@
10391040
 @ table.sbsdiff tr td {
1040
-@ white-space: pre;
10411041
 @ padding-left: 3px;
10421042
 @ padding-right: 3px;
10431043
 @ margin: 0px;
1044
+@ vertical-align: top;
1045
+@ white-space: pre-wrap;
10441046
 @ }
1045
-@
1047
+@
10461048
 @ table.sbsdiff tr td.lineno {
10471049
 @ text-align: right;
1050
+@ /* border-bottom: 1px solid rgb(220, 220, 220); */
1051
+@ }
1052
+@
1053
+@ table.sbsdiff tr td.srcline {
1054
+@ max-width: 400px;
1055
+@ /* Nota bene: May partially hide long lines witout whitespaces */
1056
+@ overflow: hidden;
1057
+@ /* border-bottom: 1px solid rgb(220, 220, 220); */
10481058
 @ }
1049
-@
1059
+@
10501060
 @ table.sbsdiff tr td.meta {
10511061
 @ background-color: rgb(170, 160, 255);
10521062
 @ text-align: center;
10531063
 @ }
1054
-@
1064
+@
10551065
 @ table.sbsdiff tr td.added {
10561066
 @ background-color: rgb(180, 250, 180);
1067
+@ /* border-bottom: 1px solid rgb(160, 230, 160); */
10571068
 @ }
1058
-@
1069
+@
10591070
 @ table.sbsdiff tr td.removed {
10601071
 @ background-color: rgb(250, 130, 130);
1072
+@ /* border-bottom: 1px solid rgb(230, 110, 110); */
10611073
 @ }
10621074
 @
10631075
 @ table.sbsdiff tr td.changed {
10641076
 @ background-color: rgb(210, 210, 200);
1077
+@ /* border-bottom: 1px solid rgb(190, 190, 180); */
10651078
 @ }');
10661079
 @ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
10671080
 @ <head>
10681081
 @ <title>$<project_name>: $<title></title>
10691082
 @ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
10701083
--- src/skins.c
+++ src/skins.c
@@ -1021,49 +1021,62 @@
1021 @ }
1022 @
1023 @ /* Side-by-side diff */
1024 @ table.sbsdiff {
1025 @ background-color: white;
1026 @ font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
1027 @ font-size: 9pt;
1028 @ border-collapse:collapse;
1029 @ white-space: pre;
1030 @ width: 98%;
1031 @ border: 1px #000 dashed;
 
 
1032 @ }
1033 @
1034 @ table.sbsdiff th.diffhdr {
1035 @ border-bottom: dotted;
1036 @ border-width: 1px;
1037 @ }
1038 @
1039 @ table.sbsdiff tr td {
1040 @ white-space: pre;
1041 @ padding-left: 3px;
1042 @ padding-right: 3px;
1043 @ margin: 0px;
 
 
1044 @ }
1045 @
1046 @ table.sbsdiff tr td.lineno {
1047 @ text-align: right;
 
 
 
 
 
 
 
 
1048 @ }
1049 @
1050 @ table.sbsdiff tr td.meta {
1051 @ background-color: rgb(170, 160, 255);
1052 @ text-align: center;
1053 @ }
1054 @
1055 @ table.sbsdiff tr td.added {
1056 @ background-color: rgb(180, 250, 180);
 
1057 @ }
1058 @
1059 @ table.sbsdiff tr td.removed {
1060 @ background-color: rgb(250, 130, 130);
 
1061 @ }
1062 @
1063 @ table.sbsdiff tr td.changed {
1064 @ background-color: rgb(210, 210, 200);
 
1065 @ }');
1066 @ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
1067 @ <head>
1068 @ <title>$<project_name>: $<title></title>
1069 @ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
1070
--- src/skins.c
+++ src/skins.c
@@ -1021,49 +1021,62 @@
1021 @ }
1022 @
1023 @ /* Side-by-side diff */
1024 @ table.sbsdiff {
1025 @ background-color: white;
1026 @ font-family: Dejavu Sans Mono, Monaco, Lucida Console, monospace;
1027 @ font-size: 8pt;
1028 @ border-collapse:collapse;
 
1029 @ width: 98%;
1030 @ border: 1px #000 dashed;
1031 @ margin-left: auto;
1032 @ margin-right: auto;
1033 @ }
1034 @
1035 @ table.sbsdiff th.diffhdr {
1036 @ border-bottom: dotted;
1037 @ border-width: 1px;
1038 @ }
1039 @
1040 @ table.sbsdiff tr td {
 
1041 @ padding-left: 3px;
1042 @ padding-right: 3px;
1043 @ margin: 0px;
1044 @ vertical-align: top;
1045 @ white-space: pre-wrap;
1046 @ }
1047 @
1048 @ table.sbsdiff tr td.lineno {
1049 @ text-align: right;
1050 @ /* border-bottom: 1px solid rgb(220, 220, 220); */
1051 @ }
1052 @
1053 @ table.sbsdiff tr td.srcline {
1054 @ max-width: 400px;
1055 @ /* Nota bene: May partially hide long lines witout whitespaces */
1056 @ overflow: hidden;
1057 @ /* border-bottom: 1px solid rgb(220, 220, 220); */
1058 @ }
1059 @
1060 @ table.sbsdiff tr td.meta {
1061 @ background-color: rgb(170, 160, 255);
1062 @ text-align: center;
1063 @ }
1064 @
1065 @ table.sbsdiff tr td.added {
1066 @ background-color: rgb(180, 250, 180);
1067 @ /* border-bottom: 1px solid rgb(160, 230, 160); */
1068 @ }
1069 @
1070 @ table.sbsdiff tr td.removed {
1071 @ background-color: rgb(250, 130, 130);
1072 @ /* border-bottom: 1px solid rgb(230, 110, 110); */
1073 @ }
1074 @
1075 @ table.sbsdiff tr td.changed {
1076 @ background-color: rgb(210, 210, 200);
1077 @ /* border-bottom: 1px solid rgb(190, 190, 180); */
1078 @ }');
1079 @ REPLACE INTO config(name,mtime,value) VALUES('header',now(),'<html>
1080 @ <head>
1081 @ <title>$<project_name>: $<title></title>
1082 @ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
1083
M src/style.c
+16
--- src/style.c
+++ src/style.c
@@ -405,10 +405,12 @@
405405
 @ font-size: 10pt;
406406
 @ border-collapse:collapse;
407407
 @ white-space: pre;
408408
 @ width: 98%;
409409
 @ border: 1px #000 dashed;
410
+@ margin-left: auto;
411
+@ margin-right: auto;
410412
 @ }
411413
 @
412414
 @ table.sbsdiff th.diffhdr {
413415
 @ border-bottom: dotted;
414416
 @ border-width: 1px;
@@ -417,32 +419,46 @@
417419
 @ table.sbsdiff tr td {
418420
 @ white-space: pre;
419421
 @ padding-left: 3px;
420422
 @ padding-right: 3px;
421423
 @ margin: 0px;
424
+@ vertical-align: top;
422425
 @ }
423426
 @
424427
 @ table.sbsdiff tr td.lineno {
425428
 @ text-align: right;
426429
 @ }
430
+@
431
+@ table.sbsdiff tr td.srcline {
432
+@ }
427433
 @
428434
 @ table.sbsdiff tr td.meta {
429435
 @ background-color: rgb(170, 160, 255);
430436
 @ text-align: center;
431437
 @ }
432438
 @
433439
 @ table.sbsdiff tr td.added {
434440
 @ background-color: rgb(180, 250, 180);
435441
 @ }
442
+@ table.sbsdiff tr td.addedvoid {
443
+@ background-color: rgb(190, 190, 180);
444
+@ }
436445
 @
437446
 @ table.sbsdiff tr td.removed {
438447
 @ background-color: rgb(250, 130, 130);
439448
 @ }
449
+@ table.sbsdiff tr td.removedvoid {
450
+@ background-color: rgb(190, 190, 180);
451
+@ }
440452
 @
441453
 @ table.sbsdiff tr td.changed {
442454
 @ background-color: rgb(210, 210, 200);
443455
 @ }
456
+@ table.sbsdiff tr td.changedvoid {
457
+@ background-color: rgb(190, 190, 180);
458
+@ }
459
+@
444460
 ;
445461
446462
447463
 /* The following table contains bits of default CSS that must
448464
 ** be included if they are not found in the application-defined
449465
--- src/style.c
+++ src/style.c
@@ -405,10 +405,12 @@
405 @ font-size: 10pt;
406 @ border-collapse:collapse;
407 @ white-space: pre;
408 @ width: 98%;
409 @ border: 1px #000 dashed;
 
 
410 @ }
411 @
412 @ table.sbsdiff th.diffhdr {
413 @ border-bottom: dotted;
414 @ border-width: 1px;
@@ -417,32 +419,46 @@
417 @ table.sbsdiff tr td {
418 @ white-space: pre;
419 @ padding-left: 3px;
420 @ padding-right: 3px;
421 @ margin: 0px;
 
422 @ }
423 @
424 @ table.sbsdiff tr td.lineno {
425 @ text-align: right;
426 @ }
 
 
 
427 @
428 @ table.sbsdiff tr td.meta {
429 @ background-color: rgb(170, 160, 255);
430 @ text-align: center;
431 @ }
432 @
433 @ table.sbsdiff tr td.added {
434 @ background-color: rgb(180, 250, 180);
435 @ }
 
 
 
436 @
437 @ table.sbsdiff tr td.removed {
438 @ background-color: rgb(250, 130, 130);
439 @ }
 
 
 
440 @
441 @ table.sbsdiff tr td.changed {
442 @ background-color: rgb(210, 210, 200);
443 @ }
 
 
 
 
444 ;
445
446
447 /* The following table contains bits of default CSS that must
448 ** be included if they are not found in the application-defined
449
--- src/style.c
+++ src/style.c
@@ -405,10 +405,12 @@
405 @ font-size: 10pt;
406 @ border-collapse:collapse;
407 @ white-space: pre;
408 @ width: 98%;
409 @ border: 1px #000 dashed;
410 @ margin-left: auto;
411 @ margin-right: auto;
412 @ }
413 @
414 @ table.sbsdiff th.diffhdr {
415 @ border-bottom: dotted;
416 @ border-width: 1px;
@@ -417,32 +419,46 @@
419 @ table.sbsdiff tr td {
420 @ white-space: pre;
421 @ padding-left: 3px;
422 @ padding-right: 3px;
423 @ margin: 0px;
424 @ vertical-align: top;
425 @ }
426 @
427 @ table.sbsdiff tr td.lineno {
428 @ text-align: right;
429 @ }
430 @
431 @ table.sbsdiff tr td.srcline {
432 @ }
433 @
434 @ table.sbsdiff tr td.meta {
435 @ background-color: rgb(170, 160, 255);
436 @ text-align: center;
437 @ }
438 @
439 @ table.sbsdiff tr td.added {
440 @ background-color: rgb(180, 250, 180);
441 @ }
442 @ table.sbsdiff tr td.addedvoid {
443 @ background-color: rgb(190, 190, 180);
444 @ }
445 @
446 @ table.sbsdiff tr td.removed {
447 @ background-color: rgb(250, 130, 130);
448 @ }
449 @ table.sbsdiff tr td.removedvoid {
450 @ background-color: rgb(190, 190, 180);
451 @ }
452 @
453 @ table.sbsdiff tr td.changed {
454 @ background-color: rgb(210, 210, 200);
455 @ }
456 @ table.sbsdiff tr td.changedvoid {
457 @ background-color: rgb(190, 190, 180);
458 @ }
459 @
460 ;
461
462
463 /* The following table contains bits of default CSS that must
464 ** be included if they are not found in the application-defined
465

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button