Fossil SCM
Resolve accidental fork.
Commit
b6e029394d529dc959bf9916c960a3492d6e2bdfe77a854d9472fadce9b72024
Parent
945e0ae4eb57dac…
2 files changed
+1
+2
-2
+1
| --- src/default.css | ||
| +++ src/default.css | ||
| @@ -751,10 +751,11 @@ | ||
| 751 | 751 | border-left: 1px solid gold; |
| 752 | 752 | } |
| 753 | 753 | body.cpage-ckout .file-change-line, |
| 754 | 754 | body.cpage-info .file-change-line, |
| 755 | 755 | body.cpage-vinfo .file-change-line, |
| 756 | +body.cpage-ci .file-change-line, | |
| 756 | 757 | body.cpage-vdiff .file-change-line { |
| 757 | 758 | margin-top: 16px; |
| 758 | 759 | margin-bottom: 16px; |
| 759 | 760 | margin-right: 1em /* keep it from nudging right up against the scrollbar-reveal zone */; |
| 760 | 761 | display: flex; |
| 761 | 762 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -751,10 +751,11 @@ | |
| 751 | border-left: 1px solid gold; |
| 752 | } |
| 753 | body.cpage-ckout .file-change-line, |
| 754 | body.cpage-info .file-change-line, |
| 755 | body.cpage-vinfo .file-change-line, |
| 756 | body.cpage-vdiff .file-change-line { |
| 757 | margin-top: 16px; |
| 758 | margin-bottom: 16px; |
| 759 | margin-right: 1em /* keep it from nudging right up against the scrollbar-reveal zone */; |
| 760 | display: flex; |
| 761 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -751,10 +751,11 @@ | |
| 751 | border-left: 1px solid gold; |
| 752 | } |
| 753 | body.cpage-ckout .file-change-line, |
| 754 | body.cpage-info .file-change-line, |
| 755 | body.cpage-vinfo .file-change-line, |
| 756 | body.cpage-ci .file-change-line, |
| 757 | body.cpage-vdiff .file-change-line { |
| 758 | margin-top: 16px; |
| 759 | margin-bottom: 16px; |
| 760 | margin-right: 1em /* keep it from nudging right up against the scrollbar-reveal zone */; |
| 761 | display: flex; |
| 762 |
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1182,14 +1182,14 @@ | ||
| 1182 | 1182 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 1183 | 1183 | @ Side-by-Side Diff</a> |
| 1184 | 1184 | } |
| 1185 | 1185 | if( diffType!=0 ){ |
| 1186 | 1186 | if( *zW ){ |
| 1187 | - @ %z(chref("button","%R/%s/%T",zPage,zName)) | |
| 1187 | + @ %z(chref("button","%R/%s/%T?diff=%d",zPage,zName,diffType)) | |
| 1188 | 1188 | @ Show Whitespace Changes</a> |
| 1189 | 1189 | }else{ |
| 1190 | - @ %z(chref("button","%R/%s/%T?w",zPage,zName)) | |
| 1190 | + @ %z(chref("button","%R/%s/%T?diff=%d&w",zPage,zName,diffType)) | |
| 1191 | 1191 | @ Ignore Whitespace</a> |
| 1192 | 1192 | } |
| 1193 | 1193 | } |
| 1194 | 1194 | if( zParent ){ |
| 1195 | 1195 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 1196 | 1196 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1182,14 +1182,14 @@ | |
| 1182 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 1183 | @ Side-by-Side Diff</a> |
| 1184 | } |
| 1185 | if( diffType!=0 ){ |
| 1186 | if( *zW ){ |
| 1187 | @ %z(chref("button","%R/%s/%T",zPage,zName)) |
| 1188 | @ Show Whitespace Changes</a> |
| 1189 | }else{ |
| 1190 | @ %z(chref("button","%R/%s/%T?w",zPage,zName)) |
| 1191 | @ Ignore Whitespace</a> |
| 1192 | } |
| 1193 | } |
| 1194 | if( zParent ){ |
| 1195 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 1196 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1182,14 +1182,14 @@ | |
| 1182 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 1183 | @ Side-by-Side Diff</a> |
| 1184 | } |
| 1185 | if( diffType!=0 ){ |
| 1186 | if( *zW ){ |
| 1187 | @ %z(chref("button","%R/%s/%T?diff=%d",zPage,zName,diffType)) |
| 1188 | @ Show Whitespace Changes</a> |
| 1189 | }else{ |
| 1190 | @ %z(chref("button","%R/%s/%T?diff=%d&w",zPage,zName,diffType)) |
| 1191 | @ Ignore Whitespace</a> |
| 1192 | } |
| 1193 | } |
| 1194 | if( zParent ){ |
| 1195 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 1196 |