Fossil SCM

Fixed misinteraction between bootstrap skin and new /brlist selection feature caused by both using the .label class for their own purposes.

stephan 2021-04-19 18:18 brlist-timeline

Commit f5bcff6cbd2a2b327b2bda571060b181f59a1838e91a678ae5e995d63a2e690f

Parent 08b90535e825e75…

4 files changed +11 -7 +2 -2 +1 -1

M skins/bootstrap/css.txt

		--- skins/bootstrap/css.txt
		+++ skins/bootstrap/css.txt
		cannot compute difference between binary files
1	1

	--- skins/bootstrap/css.txt
	+++ skins/bootstrap/css.txt
0	annot compute difference between binary files
1

	--- skins/bootstrap/css.txt
	+++ skins/bootstrap/css.txt
0	annot compute difference between binary files
1

M skins/bootstrap/footer.txt

+11 -7

		--- skins/bootstrap/footer.txt
		+++ skins/bootstrap/footer.txt
		@@ -8,20 +8,24 @@
8	8	</div>
9	9	<footer id="footer">
10	10	<p>© Copyright $<project_name>. All right reserved. Fossil $release_version · <a href="$home/timeline.rss">RSS</a></p>
11	11	</footer>
12	12	<script nonce="$<nonce>">
	13	+window.addEventListener( 'load', function() {
	14	+var i;
13	15	var tables = document.querySelectorAll('table');
14		-for (var i = 0; i < tables.length; i++) {
15		- if (tables[i].id !== "timelineTable")
16		- tables[i].classList.add('table');
	16	+for(i = 0; i < tables.length; i++) {
	17	+ if (tables[i].id !== "timelineTable"){
	18	+ tables[i].classList.add('table');
	19	+ }
17	20	};
18	21	var submenus = document.querySelectorAll('.submenu');
19		-for (var i = 0; i < submenus.length; i++) {
	22	+var labels, j;
	23	+for (i = 0; i < submenus.length; i++) {
20	24	submenus[i].classList.add('btn-group');
21		- var labels = submenus[i].querySelectorAll('.label');
22		- for (var j = 0; j < labels.length; j++) {
	25	+ labels = submenus[i].querySelectorAll('.label');
	26	+ for (j = 0; j < labels.length; j++) {
23	27	labels[j].classList.remove('label');
24	28	labels[j].classList.add('btn');
25	29	labels[j].classList.add('btn-default');
26	30	labels[j].classList.add('btn-sm');
27	31	}
		@@ -33,6 +37,6 @@
33	37	collapse.getAttribute('data-target')
34	38	);
35	39	target.classList.toggle('collapse');
36	40	target.classList.toggle('collapsed');
37	41	};
38		-</script>
	42	+});</script>
39	43

	--- skins/bootstrap/footer.txt
	+++ skins/bootstrap/footer.txt
	@@ -8,20 +8,24 @@
8	</div>
9	<footer id="footer">
10	<p>© Copyright $<project_name>. All right reserved. Fossil $release_version · <a href="$home/timeline.rss">RSS</a></p>
11	</footer>
12	<script nonce="$<nonce>">


13	var tables = document.querySelectorAll('table');
14	for (var i = 0; i < tables.length; i++) {
15	if (tables[i].id !== "timelineTable")
16	tables[i].classList.add('table');

17	};
18	var submenus = document.querySelectorAll('.submenu');
19	for (var i = 0; i < submenus.length; i++) {

20	submenus[i].classList.add('btn-group');
21	var labels = submenus[i].querySelectorAll('.label');
22	for (var j = 0; j < labels.length; j++) {
23	labels[j].classList.remove('label');
24	labels[j].classList.add('btn');
25	labels[j].classList.add('btn-default');
26	labels[j].classList.add('btn-sm');
27	}
	@@ -33,6 +37,6 @@
33	collapse.getAttribute('data-target')
34	);
35	target.classList.toggle('collapse');
36	target.classList.toggle('collapsed');
37	};
38	</script>
39

	--- skins/bootstrap/footer.txt
	+++ skins/bootstrap/footer.txt
	@@ -8,20 +8,24 @@
8	</div>
9	<footer id="footer">
10	<p>© Copyright $<project_name>. All right reserved. Fossil $release_version · <a href="$home/timeline.rss">RSS</a></p>
11	</footer>
12	<script nonce="$<nonce>">
13	window.addEventListener( 'load', function() {
14	var i;
15	var tables = document.querySelectorAll('table');
16	for(i = 0; i < tables.length; i++) {
17	if (tables[i].id !== "timelineTable"){
18	tables[i].classList.add('table');
19	}
20	};
21	var submenus = document.querySelectorAll('.submenu');
22	var labels, j;
23	for (i = 0; i < submenus.length; i++) {
24	submenus[i].classList.add('btn-group');
25	labels = submenus[i].querySelectorAll('.label');
26	for (j = 0; j < labels.length; j++) {
27	labels[j].classList.remove('label');
28	labels[j].classList.add('btn');
29	labels[j].classList.add('btn-default');
30	labels[j].classList.add('btn-sm');
31	}
	@@ -33,6 +37,6 @@
37	collapse.getAttribute('data-target')
38	);
39	target.classList.toggle('collapse');
40	target.classList.toggle('collapsed');
41	};
42	});</script>
43

M src/default.css

+2 -2

		--- src/default.css
		+++ src/default.css
		@@ -1785,14 +1785,14 @@
1785	1785	body.branch .brlist > table > tbody > tr > td:nth-child(1) {
1786	1786	display: flex;
1787	1787	flex-direction: row;
1788	1788	justify-content: space-between;
1789	1789	}
1790		-body.branch .submenu > a.label.timeline-link {
	1790	+body.branch .submenu > a.timeline-link {
1791	1791	display: none;
1792	1792	}
1793		-body.branch .submenu > a.label.timeline-link.selected {
	1793	+body.branch .submenu > a.timeline-link.selected {
1794	1794	display: inline;
1795	1795	}
1796	1796
1797	1797	/* Objects in the "desktoponly" class are invisible on mobile */
1798	1798	@media screen and (max-width: 600px) {
1799	1799

	--- src/default.css
	+++ src/default.css
	@@ -1785,14 +1785,14 @@
1785	body.branch .brlist > table > tbody > tr > td:nth-child(1) {
1786	display: flex;
1787	flex-direction: row;
1788	justify-content: space-between;
1789	}
1790	body.branch .submenu > a.label.timeline-link {
1791	display: none;
1792	}
1793	body.branch .submenu > a.label.timeline-link.selected {
1794	display: inline;
1795	}
1796
1797	/* Objects in the "desktoponly" class are invisible on mobile */
1798	@media screen and (max-width: 600px) {
1799

	--- src/default.css
	+++ src/default.css
	@@ -1785,14 +1785,14 @@
1785	body.branch .brlist > table > tbody > tr > td:nth-child(1) {
1786	display: flex;
1787	flex-direction: row;
1788	justify-content: space-between;
1789	}
1790	body.branch .submenu > a.timeline-link {
1791	display: none;
1792	}
1793	body.branch .submenu > a.timeline-link.selected {
1794	display: inline;
1795	}
1796
1797	/* Objects in the "desktoponly" class are invisible on mobile */
1798	@media screen and (max-width: 600px) {
1799

M src/fossil.page.brlist.js

+1 -1

		--- src/fossil.page.brlist.js
		+++ src/fossil.page.brlist.js
		@@ -10,11 +10,11 @@
10	10	* For the time being, continueing without 'const' and 'indexOf'
11	11	* (but that may be reconsidered later).
12	12	*/
13	13	window.addEventListener( 'load', function() {
14	14
15		-var anchor = document.querySelector("div.submenu > a.label" );
	15	+var anchor = document.querySelector("div.submenu > a:first-of-type" );
16	16	if( !anchor \|\| anchor.innerText != "Timeline" ) return;
17	17	var prefix = anchor.href.toString() + "?ms=regexp&rel&t=";
18	18	anchor.classList.add('timeline-link');
19	19
20	20	var onChange = function( event ){
21	21

	--- src/fossil.page.brlist.js
	+++ src/fossil.page.brlist.js
	@@ -10,11 +10,11 @@
10	* For the time being, continueing without 'const' and 'indexOf'
11	* (but that may be reconsidered later).
12	*/
13	window.addEventListener( 'load', function() {
14
15	var anchor = document.querySelector("div.submenu > a.label" );
16	if( !anchor \|\| anchor.innerText != "Timeline" ) return;
17	var prefix = anchor.href.toString() + "?ms=regexp&rel&t=";
18	anchor.classList.add('timeline-link');
19
20	var onChange = function( event ){
21

	--- src/fossil.page.brlist.js
	+++ src/fossil.page.brlist.js
	@@ -10,11 +10,11 @@
10	* For the time being, continueing without 'const' and 'indexOf'
11	* (but that may be reconsidered later).
12	*/
13	window.addEventListener( 'load', function() {
14
15	var anchor = document.querySelector("div.submenu > a:first-of-type" );
16	if( !anchor \|\| anchor.innerText != "Timeline" ) return;
17	var prefix = anchor.href.toString() + "?ms=regexp&rel&t=";
18	anchor.classList.add('timeline-link');
19
20	var onChange = function( event ){
21