Fossil SCM

An improved matcher algo for [76916757] and a slight padding adjustment of (.mainmenu a) elements in the default skin to work around a Firefox-specific quirk where the active link underlining did not appear.

stephan 2021-06-15 17:11 trunk
Commit 6d9ac907e550e85cdd6f8721862851640a1491380bbe824f605102720a9320d3
Parent 769167578b47fcb…
7 files changed +1 -1 +1 -1 +1 -1 +1 -1 +2 -2 +1 -1 +1 -1
~ skins/ardoise/header.txt ~ skins/blitz/header.txt ~ skins/bootstrap/header.txt ~ skins/darkmode/header.txt ~ skins/default/css.txt ~ skins/default/header.txt ~ skins/xekri/header.txt
M skins/ardoise/header.txt
+1 -1
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -26,11 +26,11 @@
2626
 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
2727
 builtin_request_js hbmenu.js
2828
 set once 1
2929
 foreach {name url expr class} $mainmenu {
3030
 if {![capexpr $expr]} continue
31
- if {$once && [string match /$current_page/* $url/]} {
31
+ if {$once && [string match $url\[/?#\]* /$current_page/]} {
3232
 set class "$class active"
3333
 set once 0
3434
 }
3535
 html "<li class='$class'>"
3636
 if {[string match /* $url]} {set url $home$url}
3737
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -26,11 +26,11 @@
26 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
27 builtin_request_js hbmenu.js
28 set once 1
29 foreach {name url expr class} $mainmenu {
30 if {![capexpr $expr]} continue
31 if {$once && [string match /$current_page/* $url/]} {
32 set class "$class active"
33 set once 0
34 }
35 html "<li class='$class'>"
36 if {[string match /* $url]} {set url $home$url}
37
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -26,11 +26,11 @@
26 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
27 builtin_request_js hbmenu.js
28 set once 1
29 foreach {name url expr class} $mainmenu {
30 if {![capexpr $expr]} continue
31 if {$once && [string match $url\[/?#\]* /$current_page/]} {
32 set class "$class active"
33 set once 0
34 }
35 html "<li class='$class'>"
36 if {[string match /* $url]} {set url $home$url}
37
M skins/blitz/header.txt
+1 -1
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -27,11 +27,11 @@
2727
 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
2828
 builtin_request_js hbmenu.js
2929
 set once 1
3030
 foreach {name url expr class} $mainmenu {
3131
 if {![capexpr $expr]} continue
32
- if {$once && [string match /$current_page/* $url/]} {
32
+ if {$once && [string match $url\[/?#\]* /$current_page/]} {
3333
 set class "active $class"
3434
 set once 0
3535
 }
3636
 html "<li class='$class'>"
3737
 if {[string match /* $url]} {set url $home$url}
3838
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -27,11 +27,11 @@
27 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
28 builtin_request_js hbmenu.js
29 set once 1
30 foreach {name url expr class} $mainmenu {
31 if {![capexpr $expr]} continue
32 if {$once && [string match /$current_page/* $url/]} {
33 set class "active $class"
34 set once 0
35 }
36 html "<li class='$class'>"
37 if {[string match /* $url]} {set url $home$url}
38
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -27,11 +27,11 @@
27 html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a></li>\n"
28 builtin_request_js hbmenu.js
29 set once 1
30 foreach {name url expr class} $mainmenu {
31 if {![capexpr $expr]} continue
32 if {$once && [string match $url\[/?#\]* /$current_page/]} {
33 set class "active $class"
34 set once 0
35 }
36 html "<li class='$class'>"
37 if {[string match /* $url]} {set url $home$url}
38
M skins/bootstrap/header.txt
+1 -1
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -45,11 +45,11 @@
4545
 set sitemap 0
4646
 set is_index [expr [string compare [string range $current_page 0 4] "index"]==0]
4747
 set is_home [expr [string compare [string range $current_page 0 [expr [string length $index_page]-1] ] $index_page]==0]
4848
 foreach {name url expr class} $mainmenu {
4949
 if {![capexpr $expr]} continue
50
- if {$once && [string match /$current_page/* $url/]} {
50
+ if {$once && [string match $url\[/?#\]* /$current_page/]} {
5151
 set class "active $class"
5252
 set once 0
5353
 }
5454
 html "<li class='$class'>"
5555
 if {[string match /* $url]} {set url $home$url}
5656
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -45,11 +45,11 @@
45 set sitemap 0
46 set is_index [expr [string compare [string range $current_page 0 4] "index"]==0]
47 set is_home [expr [string compare [string range $current_page 0 [expr [string length $index_page]-1] ] $index_page]==0]
48 foreach {name url expr class} $mainmenu {
49 if {![capexpr $expr]} continue
50 if {$once && [string match /$current_page/* $url/]} {
51 set class "active $class"
52 set once 0
53 }
54 html "<li class='$class'>"
55 if {[string match /* $url]} {set url $home$url}
56
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -45,11 +45,11 @@
45 set sitemap 0
46 set is_index [expr [string compare [string range $current_page 0 4] "index"]==0]
47 set is_home [expr [string compare [string range $current_page 0 [expr [string length $index_page]-1] ] $index_page]==0]
48 foreach {name url expr class} $mainmenu {
49 if {![capexpr $expr]} continue
50 if {$once && [string match $url\[/?#\]* /$current_page/]} {
51 set class "active $class"
52 set once 0
53 }
54 html "<li class='$class'>"
55 if {[string match /* $url]} {set url $home$url}
56
M skins/darkmode/header.txt
+1 -1
--- skins/darkmode/header.txt
+++ skins/darkmode/header.txt
@@ -17,11 +17,11 @@
1717
 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
1818
 builtin_request_js hbmenu.js
1919
 foreach {name url expr class} $mainmenu {
2020
 if {![capexpr $expr]} continue
2121
 if {[string match /* $url]} {
22
- if {[string match /$current_page/* $url/]} {
22
+ if {[string match $url\[/?#\]* /$current_page/]} {
2323
 set class "active $class"
2424
 }
2525
 set url $home$url
2626
 }
2727
 html "<a href='$url' class='$class'>$name</a>\n"
2828
--- skins/darkmode/header.txt
+++ skins/darkmode/header.txt
@@ -17,11 +17,11 @@
17 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
18 builtin_request_js hbmenu.js
19 foreach {name url expr class} $mainmenu {
20 if {![capexpr $expr]} continue
21 if {[string match /* $url]} {
22 if {[string match /$current_page/* $url/]} {
23 set class "active $class"
24 }
25 set url $home$url
26 }
27 html "<a href='$url' class='$class'>$name</a>\n"
28
--- skins/darkmode/header.txt
+++ skins/darkmode/header.txt
@@ -17,11 +17,11 @@
17 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
18 builtin_request_js hbmenu.js
19 foreach {name url expr class} $mainmenu {
20 if {![capexpr $expr]} continue
21 if {[string match /* $url]} {
22 if {[string match $url\[/?#\]* /$current_page/]} {
23 set class "active $class"
24 }
25 set url $home$url
26 }
27 html "<a href='$url' class='$class'>$name</a>\n"
28
M skins/default/css.txt
+2 -2
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -267,11 +267,11 @@
267267
 padding-top: 0px;
268268
 padding-bottom: 0px;
269269
 }
270270
 .status {padding-top: 0px;}
271271
 .mainmenu a {
272
- padding: 10px 10px;
272
+ padding: 8px 10px;
273273
 }
274274
 .mainmenu {
275275
 padding: 10px;
276276
 }
277277
 }
@@ -285,11 +285,11 @@
285285
 padding-top: 10px;
286286
 padding-bottom: 10px;
287287
 }
288288
 .status {padding-top: 30px;}
289289
 .mainmenu a {
290
- padding: 10px 20px;
290
+ padding: 8px 20px;
291291
 }
292292
 .mainmenu {
293293
 padding: 10px;
294294
 }
295295
 }
296296
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -267,11 +267,11 @@
267 padding-top: 0px;
268 padding-bottom: 0px;
269 }
270 .status {padding-top: 0px;}
271 .mainmenu a {
272 padding: 10px 10px;
273 }
274 .mainmenu {
275 padding: 10px;
276 }
277 }
@@ -285,11 +285,11 @@
285 padding-top: 10px;
286 padding-bottom: 10px;
287 }
288 .status {padding-top: 30px;}
289 .mainmenu a {
290 padding: 10px 20px;
291 }
292 .mainmenu {
293 padding: 10px;
294 }
295 }
296
--- skins/default/css.txt
+++ skins/default/css.txt
@@ -267,11 +267,11 @@
267 padding-top: 0px;
268 padding-bottom: 0px;
269 }
270 .status {padding-top: 0px;}
271 .mainmenu a {
272 padding: 8px 10px;
273 }
274 .mainmenu {
275 padding: 10px;
276 }
277 }
@@ -285,11 +285,11 @@
285 padding-top: 10px;
286 padding-bottom: 10px;
287 }
288 .status {padding-top: 30px;}
289 .mainmenu a {
290 padding: 8px 20px;
291 }
292 .mainmenu {
293 padding: 10px;
294 }
295 }
296
M skins/default/header.txt
+1 -1
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -13,11 +13,11 @@
1313
 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
1414
 builtin_request_js hbmenu.js
1515
 foreach {name url expr class} $mainmenu {
1616
 if {![capexpr $expr]} continue
1717
 if {[string match /* $url]} {
18
- if {[string match /$current_page/* $url/]} {
18
+ if {[string match $url\[/?#\]* /$current_page/]} {
1919
 set class "active $class"
2020
 }
2121
 set url $home$url
2222
 }
2323
 html "<a href='$url' class='$class'>$name</a>\n"
2424
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -13,11 +13,11 @@
13 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
14 builtin_request_js hbmenu.js
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
17 if {[string match /* $url]} {
18 if {[string match /$current_page/* $url/]} {
19 set class "active $class"
20 }
21 set url $home$url
22 }
23 html "<a href='$url' class='$class'>$name</a>\n"
24
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -13,11 +13,11 @@
13 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
14 builtin_request_js hbmenu.js
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
17 if {[string match /* $url]} {
18 if {[string match $url\[/?#\]* /$current_page/]} {
19 set class "active $class"
20 }
21 set url $home$url
22 }
23 html "<a href='$url' class='$class'>$name</a>\n"
24
M skins/xekri/header.txt
+1 -1
--- skins/xekri/header.txt
+++ skins/xekri/header.txt
@@ -94,11 +94,11 @@
9494
 <div class="mainmenu"><th1>
9595
 set sitemap 0
9696
 foreach {name url expr class} $mainmenu {
9797
 if {![capexpr $expr]} continue
9898
 if {[string match /* $url]} {
99
- if {[string match /$current_page/* $url/]} {
99
+ if {[string match $url\[/?#\]* /$current_page/]} {
100100
 set class "active $class"
101101
 }
102102
 set url $home$url
103103
 }
104104
 html "<a href='$url' class='$class'>$name</a>\n"
105105
--- skins/xekri/header.txt
+++ skins/xekri/header.txt
@@ -94,11 +94,11 @@
94 <div class="mainmenu"><th1>
95 set sitemap 0
96 foreach {name url expr class} $mainmenu {
97 if {![capexpr $expr]} continue
98 if {[string match /* $url]} {
99 if {[string match /$current_page/* $url/]} {
100 set class "active $class"
101 }
102 set url $home$url
103 }
104 html "<a href='$url' class='$class'>$name</a>\n"
105
--- skins/xekri/header.txt
+++ skins/xekri/header.txt
@@ -94,11 +94,11 @@
94 <div class="mainmenu"><th1>
95 set sitemap 0
96 foreach {name url expr class} $mainmenu {
97 if {![capexpr $expr]} continue
98 if {[string match /* $url]} {
99 if {[string match $url\[/?#\]* /$current_page/]} {
100 set class "active $class"
101 }
102 set url $home$url
103 }
104 html "<a href='$url' class='$class'>$name</a>\n"
105

Keyboard Shortcuts

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