Fossil SCM

Avoid column breaks inside a top-level bullet in the /sitemap.

drh 2018-09-05 15:16 trunk
Commit dc5e06ff71b2a3a6e441a50870e2bac0e834be7ff20939b252293a794687d44f
Parent 30e9ccd59dda6c2…
2 files changed +3 +7 -5
~ src/default_css.txt ~ src/sitemap.c
M src/default_css.txt
+3
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,10 +195,13 @@
195195
 padding: 0 0 0 1em;
196196
 }
197197
 div.columns > ul li:first-child {
198198
 margin-top:0px;
199199
 }
200
+div.columns li {
201
+ break-inside: avoid;
202
+}
200203
 .filetree {
201204
 margin: 1em 0;
202205
 line-height: 1.5;
203206
 }
204207
 .filetree > ul {
205208
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,10 +195,13 @@
195 padding: 0 0 0 1em;
196 }
197 div.columns > ul li:first-child {
198 margin-top:0px;
199 }
 
 
 
200 .filetree {
201 margin: 1em 0;
202 line-height: 1.5;
203 }
204 .filetree > ul {
205
--- src/default_css.txt
+++ src/default_css.txt
@@ -195,10 +195,13 @@
195 padding: 0 0 0 1em;
196 }
197 div.columns > ul li:first-child {
198 margin-top:0px;
199 }
200 div.columns li {
201 break-inside: avoid;
202 }
203 .filetree {
204 margin: 1em 0;
205 line-height: 1.5;
206 }
207 .filetree > ul {
208
M src/sitemap.c
+7 -5
--- src/sitemap.c
+++ src/sitemap.c
@@ -56,13 +56,13 @@
5656
 if( !inSublist ){
5757
 @ <ul>
5858
 inSublist = 1;
5959
 }
6060
 if( z[0]=='/' ){
61
- @ <li>%z(href("%R%s",z))%s(aExtra[i].zTitle)</li>
61
+ @ <li>%z(href("%R%s",z))%s(aExtra[i].zTitle)</a></li>
6262
 }else{
63
- @ <li>%z(href("%s",z))%s(aExtra[i].zTitle)</li>
63
+ @ <li>%z(href("%s",z))%s(aExtra[i].zTitle)</a></li>
6464
 }
6565
 }
6666
 if( srchFlags & SRCH_DOC ){
6767
 if( !inSublist ){
6868
 @ <ul>
@@ -74,31 +74,32 @@
7474
 @ </ul>
7575
 inSublist = 0;
7676
 }
7777
 @ </li>
7878
 if( g.perm.Read ){
79
- @ <li>%z(href("%R/tree"))File Browser</a></li>
79
+ @ <li>%z(href("%R/tree"))File Browser</a>
8080
 @ <ul>
8181
 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
8282
 @ Trunk Check-in</a></li>
8383
 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
8484
 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
8585
 @ <li>%z(href("%R/uvlist"))Unversioned Files</a>
8686
 @ </ul>
8787
 }
8888
 if( g.perm.Read ){
89
- @ <li>%z(href("%R/timeline"))Project Timeline</a></li>
89
+ @ <li>%z(href("%R/timeline"))Project Timeline</a>
9090
 @ <ul>
9191
 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
9292
 @ <li>%z(href("%R/timeline?n=all&namechng"))File name changes</a></li>
9393
 @ <li>%z(href("%R/timeline?n=all&forks"))Forks</a></li>
9494
 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
9595
 @ check-ins</a></li>
9696
 @ </ul>
97
+ @ </li>
9798
 }
9899
 if( g.perm.Read ){
99
- @ <li>%z(href("%R/brlist"))Branches</a></li>
100
+ @ <li>%z(href("%R/brlist"))Branches</a>
100101
 @ <ul>
101102
 @ <li>%z(href("%R/taglist"))Tags</a></li>
102103
 @ <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
103104
 @ </ul>
104105
 @ </li>
@@ -109,10 +110,11 @@
109110
 if( g.perm.RdForum ){
110111
 @ <li>%z(href("%R/forum"))Forum</a>
111112
 @ <ul>
112113
 @ <li>%z(href("%R/timeline?y=f"))Recent activity</a></li>
113114
 @ </ul>
115
+ @ </li>
114116
 }
115117
 if( g.perm.RdTkt ){
116118
 @ <li>%z(href("%R/reportlist"))Tickets</a>
117119
 @ <ul>
118120
 if( srchFlags & SRCH_TKT ){
119121
--- src/sitemap.c
+++ src/sitemap.c
@@ -56,13 +56,13 @@
56 if( !inSublist ){
57 @ <ul>
58 inSublist = 1;
59 }
60 if( z[0]=='/' ){
61 @ <li>%z(href("%R%s",z))%s(aExtra[i].zTitle)</li>
62 }else{
63 @ <li>%z(href("%s",z))%s(aExtra[i].zTitle)</li>
64 }
65 }
66 if( srchFlags & SRCH_DOC ){
67 if( !inSublist ){
68 @ <ul>
@@ -74,31 +74,32 @@
74 @ </ul>
75 inSublist = 0;
76 }
77 @ </li>
78 if( g.perm.Read ){
79 @ <li>%z(href("%R/tree"))File Browser</a></li>
80 @ <ul>
81 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
82 @ Trunk Check-in</a></li>
83 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
84 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
85 @ <li>%z(href("%R/uvlist"))Unversioned Files</a>
86 @ </ul>
87 }
88 if( g.perm.Read ){
89 @ <li>%z(href("%R/timeline"))Project Timeline</a></li>
90 @ <ul>
91 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
92 @ <li>%z(href("%R/timeline?n=all&namechng"))File name changes</a></li>
93 @ <li>%z(href("%R/timeline?n=all&forks"))Forks</a></li>
94 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
95 @ check-ins</a></li>
96 @ </ul>
 
97 }
98 if( g.perm.Read ){
99 @ <li>%z(href("%R/brlist"))Branches</a></li>
100 @ <ul>
101 @ <li>%z(href("%R/taglist"))Tags</a></li>
102 @ <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
103 @ </ul>
104 @ </li>
@@ -109,10 +110,11 @@
109 if( g.perm.RdForum ){
110 @ <li>%z(href("%R/forum"))Forum</a>
111 @ <ul>
112 @ <li>%z(href("%R/timeline?y=f"))Recent activity</a></li>
113 @ </ul>
 
114 }
115 if( g.perm.RdTkt ){
116 @ <li>%z(href("%R/reportlist"))Tickets</a>
117 @ <ul>
118 if( srchFlags & SRCH_TKT ){
119
--- src/sitemap.c
+++ src/sitemap.c
@@ -56,13 +56,13 @@
56 if( !inSublist ){
57 @ <ul>
58 inSublist = 1;
59 }
60 if( z[0]=='/' ){
61 @ <li>%z(href("%R%s",z))%s(aExtra[i].zTitle)</a></li>
62 }else{
63 @ <li>%z(href("%s",z))%s(aExtra[i].zTitle)</a></li>
64 }
65 }
66 if( srchFlags & SRCH_DOC ){
67 if( !inSublist ){
68 @ <ul>
@@ -74,31 +74,32 @@
74 @ </ul>
75 inSublist = 0;
76 }
77 @ </li>
78 if( g.perm.Read ){
79 @ <li>%z(href("%R/tree"))File Browser</a>
80 @ <ul>
81 @ <li>%z(href("%R/tree?type=tree&ci=trunk"))Tree-view,
82 @ Trunk Check-in</a></li>
83 @ <li>%z(href("%R/tree?type=flat"))Flat-view</a></li>
84 @ <li>%z(href("%R/fileage?name=trunk"))File ages for Trunk</a></li>
85 @ <li>%z(href("%R/uvlist"))Unversioned Files</a>
86 @ </ul>
87 }
88 if( g.perm.Read ){
89 @ <li>%z(href("%R/timeline"))Project Timeline</a>
90 @ <ul>
91 @ <li>%z(href("%R/reports"))Activity Reports</a></li>
92 @ <li>%z(href("%R/timeline?n=all&namechng"))File name changes</a></li>
93 @ <li>%z(href("%R/timeline?n=all&forks"))Forks</a></li>
94 @ <li>%z(href("%R/timeline?a=1970-01-01&y=ci&n=10"))First 10
95 @ check-ins</a></li>
96 @ </ul>
97 @ </li>
98 }
99 if( g.perm.Read ){
100 @ <li>%z(href("%R/brlist"))Branches</a>
101 @ <ul>
102 @ <li>%z(href("%R/taglist"))Tags</a></li>
103 @ <li>%z(href("%R/leaves"))Leaf Check-ins</a></li>
104 @ </ul>
105 @ </li>
@@ -109,10 +110,11 @@
110 if( g.perm.RdForum ){
111 @ <li>%z(href("%R/forum"))Forum</a>
112 @ <ul>
113 @ <li>%z(href("%R/timeline?y=f"))Recent activity</a></li>
114 @ </ul>
115 @ </li>
116 }
117 if( g.perm.RdTkt ){
118 @ <li>%z(href("%R/reportlist"))Tickets</a>
119 @ <ul>
120 if( srchFlags & SRCH_TKT ){
121

Keyboard Shortcuts

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