Skip to content

Commit e5253d9

Browse files
authored
Merge pull request #4068 from raspberrypi/develop
Deploy to production
2 parents bcd7a2d + fa90756 commit e5253d9

File tree

7 files changed

+14
-1257
lines changed

7 files changed

+14
-1257
lines changed

jekyll-assets/_includes/head.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
<link rel="stylesheet" href="{{ site.baseurl }}/css/asciidoctor-tabs.css?ver={{ site.time | date: '%s' }}">
2222
<link rel="stylesheet" href="{{ site.baseurl }}/css/syntax-highlighting.css?ver={{ site.time | date: '%s' }}">
2323
<link rel="stylesheet" href="{{ site.baseurl }}/css/tocbot.css?ver={{ site.time | date: '%s' }}">
24-
<script type="text/javascript" src="{{ site.baseurl }}/scripts/tocbot.js?ver={{ site.time | date: '%s' }}"></script>
25-
<script type="text/javascript" src="{{ site.baseurl }}/scripts/toc.js?ver={{ site.time | date: '%s' }}"></script>
2624
<script async src="https://www.googletagmanager.com/gtag/js?id=G-V8TFXM3BKJ"></script>
2725
<script>
2826
window.dataLayer = window.dataLayer || [];

jekyll-assets/_layouts/boxes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
{% include head.html %}
55
</head>
6-
<body onload="makeToc()">
6+
<body>
77
{% include header.html %}
88

99
<div class="toptitle">

jekyll-assets/_layouts/docs.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
{% include head.html %}
55
</head>
6-
<body onload="makeToc()">
6+
<body>
77
<input type="checkbox" id="mobile-toggle" />
88
{% include header.html %}
99
<div id="docs-content">
@@ -162,11 +162,7 @@ <h1>{{ page.sub_title | markdownify | remove: '<p>' | remove: '</p>'}}</h1>
162162
<div id="on-this-page">
163163
<div id="on-this-page-inner">
164164
<h5>On this page</h5>
165-
<div id="toc">
166-
{{ page.document | tocify_asciidoc: 3 }}
167-
</div>
168-
<div id="tocbot">
169-
</div>
165+
<div id="tocbot" class="js-toc"></div>
170166
</div>
171167
</div>
172168
</div>
@@ -178,6 +174,14 @@ <h5>On this page</h5>
178174
<script async type="text/javascript" src="{{ site.baseurl }}/scripts/asciidoctor-tabs.js?ver={{ site.time | date: '%s' }}"></script>
179175
<script async type="text/javascript" src="{{ site.baseurl }}/scripts/clipboard.min.js?ver={{ site.time | date: '%s' }}"></script>
180176
<script async type="text/javascript" src="{{ site.baseurl }}/scripts/copy-to-clipboard.js?ver={{ site.time | date: '%s' }}"></script>
177+
<script type="text/javascript" src="{{ site.baseurl }}/scripts/tocbot.min.js?ver={{ site.time | date: '%s' }}"></script>
178+
<script>
179+
tocbot.init({
180+
contentSelector: '#content',
181+
headingSelector: 'h1, h2, h3, h4',
182+
includeHtml: true
183+
});
184+
</script>
181185

182186
{% include search.html %}
183187
</div>

jekyll-assets/css/style.css

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,6 @@ input:checked + li span label div .toc-item::before {
368368
margin-bottom: 6px;
369369
}
370370

371-
/* hide the non-tocbot non-interactive toctree from view -- just needed to generate tocbot version */
372-
#on-this-page-inner #toc {
373-
display: none;
374-
}
375-
376371
.sectlevel1 {
377372
flex-grow: 0;
378373
margin-right: 10px;
@@ -547,11 +542,11 @@ nav#mobile-contents {
547542
}
548543
549544
@media screen{
550-
#tocbot > ul.toc-list{
545+
#tocbot > ol.toc-list{
551546
margin-bottom: 0.5em;
552547
margin-left: 0.125em
553548
}
554-
#tocbot ul.sectlevel0, #tocbot a.toc-link.node-name--H1 + ul {
549+
#tocbot ul.sectlevel0, #tocbot a.toc-link.node-name--H1 + ol {
555550
padding-left: 0;
556551
}
557552
#tocbot a.toc-link{

jekyll-assets/scripts/toc.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)