Fossil SCM

Fixes to default styling.

drh 2017-11-29 02:48 UTC sticky-timeline-style
Commit e814b1e583dc92b3a532a889d19c45227ba8d16df04beba567ca79167526777c
Parent c0a3a90b28e05da…
2 files changed +20 -13 +6 -8
~ src/style.c ~ src/timeline.c
M src/style.c
+20 -13
--- src/style.c
+++ src/style.c
@@ -784,22 +784,13 @@
784784
 @ font-style: italic;
785785
 @ font-size: small;
786786
 },
787787
 { "table.timelineTable",
788788
 "the format for the timeline data table",
789
- @ border: 0;
789
+ @ border: 0px;
790790
 @ border-collapse: collapse;
791791
 },
792
- { "td.timelineTableCell",
793
- "the format for the timeline data cells",
794
- @ vertical-align: top;
795
- @ text-align: left;
796
- },
797
- { "td.timelineDetailCell",
798
- "the format for the timeline data cells for the detail column",
799
- @ padding-left: 2em;
800
- },
801792
 { "tr.timelineCurrent",
802793
 "the format for the timeline data cell of the current checkout",
803794
 @ padding: .1em .2em;
804795
 @ border: 1px dashed #446979;
805796
 @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
@@ -837,17 +828,33 @@
837828
 "the format for the graph placeholder cells in timelines",
838829
 @ width: 20px;
839830
 @ text-align: left;
840831
 @ vertical-align: top;
841832
 },
842
- { "span.timelineComment",
843
- "The check-in comment text in a timeline",
833
+ { "span.timelineCompactComment",
834
+ "The check-in comment text in Compact mode",
844835
 @ cursor: pointer;
845836
 },
846837
 { "span.timelineEllipsis",
847
- "The ellipsis mark at the end of a check-in comment in a timeline",
838
+ "The ellipsis mark at the end of a compact comment in a timeline",
848839
 @ cursor: pointer;
840
+ },
841
+ { ".timelineNormalCell, .timelineColumnarCell, .timelineDetailCell",
842
+ "The entry details for a normal timeline",
843
+ @ vertical-align: top;
844
+ @ text-align: left;
845
+ @ padding: 0.75em;
846
+ @ border: 1px #ccc solid;
847
+ @ border-radius: 1em;
848
+ },
849
+ { ".timelineNormalDetail",
850
+ "Detail text for a normal timeline display",
851
+ @ font-size: 80%;
852
+ @ text-align: right;
853
+ @ float: right;
854
+ @ opacity: 0.75;
855
+ @ margin-top: 0.5em;
849856
 },
850857
 { "td.timelineGraph",
851858
 "the format for the graph placeholder cells in timelines",
852859
 @ width: 20px;
853860
 @ text-align: left;
854861
--- src/style.c
+++ src/style.c
@@ -784,22 +784,13 @@
784 @ font-style: italic;
785 @ font-size: small;
786 },
787 { "table.timelineTable",
788 "the format for the timeline data table",
789 @ border: 0;
790 @ border-collapse: collapse;
791 },
792 { "td.timelineTableCell",
793 "the format for the timeline data cells",
794 @ vertical-align: top;
795 @ text-align: left;
796 },
797 { "td.timelineDetailCell",
798 "the format for the timeline data cells for the detail column",
799 @ padding-left: 2em;
800 },
801 { "tr.timelineCurrent",
802 "the format for the timeline data cell of the current checkout",
803 @ padding: .1em .2em;
804 @ border: 1px dashed #446979;
805 @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
@@ -837,17 +828,33 @@
837 "the format for the graph placeholder cells in timelines",
838 @ width: 20px;
839 @ text-align: left;
840 @ vertical-align: top;
841 },
842 { "span.timelineComment",
843 "The check-in comment text in a timeline",
844 @ cursor: pointer;
845 },
846 { "span.timelineEllipsis",
847 "The ellipsis mark at the end of a check-in comment in a timeline",
848 @ cursor: pointer;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
849 },
850 { "td.timelineGraph",
851 "the format for the graph placeholder cells in timelines",
852 @ width: 20px;
853 @ text-align: left;
854
--- src/style.c
+++ src/style.c
@@ -784,22 +784,13 @@
784 @ font-style: italic;
785 @ font-size: small;
786 },
787 { "table.timelineTable",
788 "the format for the timeline data table",
789 @ border: 0px;
790 @ border-collapse: collapse;
791 },
 
 
 
 
 
 
 
 
 
792 { "tr.timelineCurrent",
793 "the format for the timeline data cell of the current checkout",
794 @ padding: .1em .2em;
795 @ border: 1px dashed #446979;
796 @ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
@@ -837,17 +828,33 @@
828 "the format for the graph placeholder cells in timelines",
829 @ width: 20px;
830 @ text-align: left;
831 @ vertical-align: top;
832 },
833 { "span.timelineCompactComment",
834 "The check-in comment text in Compact mode",
835 @ cursor: pointer;
836 },
837 { "span.timelineEllipsis",
838 "The ellipsis mark at the end of a compact comment in a timeline",
839 @ cursor: pointer;
840 },
841 { ".timelineNormalCell, .timelineColumnarCell, .timelineDetailCell",
842 "The entry details for a normal timeline",
843 @ vertical-align: top;
844 @ text-align: left;
845 @ padding: 0.75em;
846 @ border: 1px #ccc solid;
847 @ border-radius: 1em;
848 },
849 { ".timelineNormalDetail",
850 "Detail text for a normal timeline display",
851 @ font-size: 80%;
852 @ text-align: right;
853 @ float: right;
854 @ opacity: 0.75;
855 @ margin-top: 0.5em;
856 },
857 { "td.timelineGraph",
858 "the format for the graph placeholder cells in timelines",
859 @ width: 20px;
860 @ text-align: left;
861
M src/timeline.c
+6 -8
--- src/timeline.c
+++ src/timeline.c
@@ -458,22 +458,20 @@
458458
 }
459459
 db_reset(&bisectQuery);
460460
 }
461461
 drawDetailEllipsis = (tmFlags & TIMELINE_COMPACT)!=0;
462462
 db_column_blob(pQuery, commentColumn, &comment);
463
+ if( tmFlags & TIMELINE_COMPACT ){
464
+ @ <span class='timelineCompactComment' onclick='toggleDetail(%d(rid))'>
465
+ }else{
466
+ @ <span class='timeline%s(zStyle)Comment'>
467
+ }
463468
 if( zType[0]!='c' ){
464469
 /* Comments for anything other than a check-in are generated by
465470
 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
466
- @ <span class='timelineComment' onclick='toggleDetail(%d(rid))'>
467471
 wiki_convert(&comment, 0, WIKI_INLINE);
468
- @ </span>
469472
 }else{
470
- if( tmFlags & TIMELINE_COMPACT ){
471
- @ <span class='timelineComment' onclick='toggleDetail(%d(rid))'>
472
- }else{
473
- @ <span class='timelineComment'>
474
- }
475473
 if( bCommentGitStyle ){
476474
 /* Truncate comment at first blank line */
477475
 int ii, jj;
478476
 int n = blob_size(&comment);
479477
 char *z = blob_str(&comment);
@@ -494,12 +492,12 @@
494492
 blob_reset(&truncated);
495493
 drawDetailEllipsis = 0;
496494
 }else{
497495
 cgi_printf("%W",blob_str(&comment));
498496
 }
499
- @ </span>
500497
 }
498
+ @ </span>
501499
 blob_reset(&comment);
502500
503501
 /* Generate extra information and hyperlinks to follow the comment.
504502
 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
505503
 */
506504
--- src/timeline.c
+++ src/timeline.c
@@ -458,22 +458,20 @@
458 }
459 db_reset(&bisectQuery);
460 }
461 drawDetailEllipsis = (tmFlags & TIMELINE_COMPACT)!=0;
462 db_column_blob(pQuery, commentColumn, &comment);
 
 
 
 
 
463 if( zType[0]!='c' ){
464 /* Comments for anything other than a check-in are generated by
465 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
466 @ <span class='timelineComment' onclick='toggleDetail(%d(rid))'>
467 wiki_convert(&comment, 0, WIKI_INLINE);
468 @ </span>
469 }else{
470 if( tmFlags & TIMELINE_COMPACT ){
471 @ <span class='timelineComment' onclick='toggleDetail(%d(rid))'>
472 }else{
473 @ <span class='timelineComment'>
474 }
475 if( bCommentGitStyle ){
476 /* Truncate comment at first blank line */
477 int ii, jj;
478 int n = blob_size(&comment);
479 char *z = blob_str(&comment);
@@ -494,12 +492,12 @@
494 blob_reset(&truncated);
495 drawDetailEllipsis = 0;
496 }else{
497 cgi_printf("%W",blob_str(&comment));
498 }
499 @ </span>
500 }
 
501 blob_reset(&comment);
502
503 /* Generate extra information and hyperlinks to follow the comment.
504 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
505 */
506
--- src/timeline.c
+++ src/timeline.c
@@ -458,22 +458,20 @@
458 }
459 db_reset(&bisectQuery);
460 }
461 drawDetailEllipsis = (tmFlags & TIMELINE_COMPACT)!=0;
462 db_column_blob(pQuery, commentColumn, &comment);
463 if( tmFlags & TIMELINE_COMPACT ){
464 @ <span class='timelineCompactComment' onclick='toggleDetail(%d(rid))'>
465 }else{
466 @ <span class='timeline%s(zStyle)Comment'>
467 }
468 if( zType[0]!='c' ){
469 /* Comments for anything other than a check-in are generated by
470 ** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
 
471 wiki_convert(&comment, 0, WIKI_INLINE);
 
472 }else{
 
 
 
 
 
473 if( bCommentGitStyle ){
474 /* Truncate comment at first blank line */
475 int ii, jj;
476 int n = blob_size(&comment);
477 char *z = blob_str(&comment);
@@ -494,12 +492,12 @@
492 blob_reset(&truncated);
493 drawDetailEllipsis = 0;
494 }else{
495 cgi_printf("%W",blob_str(&comment));
496 }
 
497 }
498 @ </span>
499 blob_reset(&comment);
500
501 /* Generate extra information and hyperlinks to follow the comment.
502 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
503 */
504

Keyboard Shortcuts

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