You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/24 07:10:17 UTC
[isis-antora] branch master updated (2248356 -> 9cfab88)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis-antora.git.
from 2248356 adds tocbot as local resource
new 78e6bce further mods to menu, fixes src link to local tocbot, adds CSS for external link icon with xref
new 9cfab88 deeper tocbot headings, creates links of menu headings.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
preview-src/index.adoc | 5 ++
src/css/extensions/article-toc.css | 13 ++++-
src/css/links-external.css | 4 +-
src/css/main-toc.css | 19 -------
src/css/site.css | 1 -
.../4.8.0/tocbot.min.js => tocbot.bundle.js} | 1 +
src/partials/footer-scripts.hbs | 6 +--
src/partials/header-content.hbs | 60 +++++++++++-----------
8 files changed, 54 insertions(+), 55 deletions(-)
delete mode 100644 src/css/main-toc.css
rename src/js/vendor/{tocbot/4.8.0/tocbot.min.js => tocbot.bundle.js} (99%)
[isis-antora] 01/02: further mods to menu,
fixes src link to local tocbot, adds CSS for external link icon with xref
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-antora.git
commit 78e6bced86ff50228a6e62b2298155089470cee6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 23 10:07:44 2019 +0100
further mods to menu, fixes src link to local tocbot, adds CSS for external link icon with xref
---
preview-src/index.adoc | 5 +++
src/css/links-external.css | 4 ++-
src/css/main-toc.css | 19 ----------
src/css/site.css | 1 -
.../4.8.0/tocbot.min.js => tocbot.bundle.js} | 1 +
src/partials/footer-scripts.hbs | 4 +--
src/partials/header-content.hbs | 40 ++++++++++++----------
7 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/preview-src/index.adoc b/preview-src/index.adoc
index 26bb2b5..1a2f7d0 100644
--- a/preview-src/index.adoc
+++ b/preview-src/index.adoc
@@ -353,6 +353,11 @@ Id magna omnîs pârtem nàm, in qûô clitâ eleifend urbânitàs, çum sàlè
Ad pro fùgit populô. Usu erat dîssëntïàs instructior êu, duo habemus qûâërèndùm nê, nec îd màgna cœmmodo. Et hinc mûndi œffëndît mel, êros atomôrum te vîx, vel duis partiêndœ tê. Prï grâeci dèfînitîonès êt.
+== Links
+
+[external]
+* xref:index.adoc[external link]
+
[discrete]
== Voluptua singulis
diff --git a/src/css/links-external.css b/src/css/links-external.css
index f600de1..89b09d8 100644
--- a/src/css/links-external.css
+++ b/src/css/links-external.css
@@ -1,5 +1,7 @@
article.doc a[href^="http:"]::after,
-article.doc a[href^="https:"]::after {
+article.doc a[href^="https:"]::after,
+article.doc a.external::after,
+article.doc .external a::after {
content: url("../img/external-link_font-awesome.svg");
background-size: 1em 1em;
display: inline-block;
diff --git a/src/css/main-toc.css b/src/css/main-toc.css
deleted file mode 100644
index 9524d26..0000000
--- a/src/css/main-toc.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.main-view-and-toc {
- display: flex;
- flex-direction: column-reverse;
-}
-
-.main-view-and-toolbar {
- /* min-width: 0 required for flexbox to constrain overflowing elements */
- min-width: 0;
-}
-
-@media screen and (min-width: 1024px) {
- .main-view-and-toolbar {
- width: 100%;
- }
-
- .main-view-and-toc {
- flex-direction: row;
- }
-}
diff --git a/src/css/site.css b/src/css/site.css
index fd6a1f9..a25778c 100644
--- a/src/css/site.css
+++ b/src/css/site.css
@@ -5,7 +5,6 @@
@import "body.css";
@import "nav.css";
@import "main.css";
-@import "main-toc.css";
@import "toolbar.css";
@import "breadcrumbs.css";
@import "page-versions.css";
diff --git a/src/js/vendor/tocbot/4.8.0/tocbot.min.js b/src/js/vendor/tocbot.bundle.js
similarity index 99%
rename from src/js/vendor/tocbot/4.8.0/tocbot.min.js
rename to src/js/vendor/tocbot.bundle.js
index 7a8e5f4..188dc04 100644
--- a/src/js/vendor/tocbot/4.8.0/tocbot.min.js
+++ b/src/js/vendor/tocbot.bundle.js
@@ -1,3 +1,4 @@
/* eslint-disable */
+/* 4.8.0 */
!function(e){function t(o){if(n[o])return n[o].exports;var l=n[o]={i:o,l:!1,exports:{}};return e[o].call(l.exports,l,l.exports,t),l.l=!0,l.exports}var n={};t.m=e,t.c=n,t.d=function(e,n,o){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:o})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=0)}([function(e,t,n){(function(o){va [...]
/* eslint-enable */
diff --git a/src/partials/footer-scripts.hbs b/src/partials/footer-scripts.hbs
index 880a6c6..75c19ba 100644
--- a/src/partials/footer-scripts.hbs
+++ b/src/partials/footer-scripts.hbs
@@ -1,8 +1,6 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.8.0/tocbot.min.js"></script>
-
<script src="{{uiRootPath}}/js/site.js"></script>
<script async src="{{uiRootPath}}/js/vendor/highlight.js"></script>
-<script async src="{{uiRootPath}}/js/vendor/tocbot/4.8.0/tocbot.min.js"></script>
+<script src="{{uiRootPath}}/js/vendor/tocbot.js"></script>
<script>
tocbot.init( {
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index 41c42e8..51a9365 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -14,8 +14,8 @@
<a class="navbar-link" href="#">Quick Start</a>
<div class="navbar-dropdown">
<span class="navbar-item">Starter Apps</span>
- <a class="navbar-item" href="/arch/helloworld/about.html">Hello World</a>
- <a class="navbar-item" href="/arch/simpleapp/about.html">Simple App</a>
+ <a class="navbar-item" href="/helloworld/about.html">Hello World</a>
+ <a class="navbar-item" href="/simpleapp/about.html">Simple App</a>
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
@@ -24,8 +24,6 @@
<span class="navbar-item">User Guides</span>
<a class="navbar-item" href="/ug/about.html">Fundamentals & Beyond</a>
<a class="navbar-item" href="/demoapp/about.html">Demo App</a>
- <a class="navbar-item" href="/devguide/about.html">Developers' Guide</a>
- <a class="navbar-item" href="/mavendeps/about.html">Maven mixins</a>
<hr class="navbar-divider"/>
<span class="navbar-item">Reference Guides</span>
<a class="navbar-item" href="/rg/ant/about.html">Annotations</a>
@@ -63,27 +61,19 @@
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
- <a class="navbar-link" href="#">Internal</a>
- <div class="navbar-dropdown">
- <span class="navbar-item">Committers</span>
- <a class="navbar-item" href="/comguide/about.html">Committers' Guide</a>
- <hr class="navbar-divider"/>
- <span class="navbar-item">Implementation</span>
- <a class="navbar-item" href="/archdesign/about.html">Architecture/Design/Plugins</a>
- <a class="navbar-item" href="/fis/about.html">Framework Internal Services</a>
- <a class="navbar-item" href="/smoketests/about.html">SmokeTest App</a>
- </div>
- </div>
- <div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Support</a>
<div class="navbar-dropdown">
+ <span class="navbar-item">Resources</span>
+ <a class="navbar-item" href="/toc/devguide/about.html">Developers' Guide</a>
+ <a class="navbar-item" href="/mavendeps/about.html">Maven mixins</a>
+ <hr class="navbar-divider"/>
<span class="navbar-item">Mailing Lists</span>
- <a class="navbar-item" href="/toc/how-tos/how-to-subscribe.html">How to subscribe</a>
+ <a class="navbar-item" href="/toc/mailing-list/how-to-subscribe.html">How to subscribe</a>
<a class="navbar-item" href="https://lists.apache.org/list.html?users@isis.apache.org">Archives (ASF Pony Mail)</a>
<a class="navbar-item" href="http://isis.markmail.org/search/?q=">Archives (Markmail)</a>
<hr class="navbar-divider"/>
<span class="navbar-item">Releases</span>
- <a class="navbar-item" href="/downloads/about.html">Downloads</a>
+ <a class="navbar-item" href="/toc/downloads/how-to.html">Downloads</a>
<a class="navbar-item" href="/relnotes/about.html">Release Notes</a>
<a class="navbar-item" href="/mignotes/about.html">Migration Notes</a>
<hr class="navbar-divider"/>
@@ -95,6 +85,18 @@
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
+ <a class="navbar-link" href="#">Internal</a>
+ <div class="navbar-dropdown">
+ <span class="navbar-item">Committers</span>
+ <a class="navbar-item" href="/toc/comguide/about.html">Committers' Guide</a>
+ <hr class="navbar-divider"/>
+ <span class="navbar-item">Implementation</span>
+ <a class="navbar-item" href="/archdesign/about.html">Architecture & Design</a>
+ <a class="navbar-item" href="/fis/about.html">Framework Internal Services</a>
+ <a class="navbar-item" href="/smoketests/about.html">SmokeTest App</a>
+ </div>
+ </div>
+ <div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">@ASF</a>
<div class="navbar-dropdown">
<a class="navbar-item" href="http://www.apache.org/">Apache Homepage</a>
@@ -107,7 +109,7 @@
<a class="navbar-item" href="https://whimsy.apache.org/board/minutes/Isis.html">PMC board minutes</a>
</div>
</div>
- <a class="navbar-item" href="https://isis.apache.org">
+ <a class="navbar-item" href="/toc/about.html">
<span class="icon">
<img src="/_/img/isis-logo-48x48.png"></img>
</span>
[isis-antora] 02/02: deeper tocbot headings,
creates links of menu headings.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-antora.git
commit 9cfab8867b7e53b75ec065dedc4d996bd30fcf3d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 24 06:38:58 2019 +0100
deeper tocbot headings, creates links of menu headings.
---
src/css/extensions/article-toc.css | 13 ++++++++++++-
src/partials/footer-scripts.hbs | 2 +-
src/partials/header-content.hbs | 26 +++++++++++++-------------
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/css/extensions/article-toc.css b/src/css/extensions/article-toc.css
index aaab78a..cfa84d1 100644
--- a/src/css/extensions/article-toc.css
+++ b/src/css/extensions/article-toc.css
@@ -16,7 +16,9 @@
@media screen {
.doc h3::before,
- .doc h4::before {
+ .doc h4::before,
+ .doc h5::before,
+ .doc h6::before {
display: block;
content: " ";
height: 112px;
@@ -27,6 +29,15 @@
}
}
+@media screen {
+ .doc h3,
+ .doc h4,
+ .doc h5,
+ .doc h6 {
+ color: darkred;
+ }
+}
+
.article-aside {
display: none;
max-height: calc(100% - 14rem);
diff --git a/src/partials/footer-scripts.hbs b/src/partials/footer-scripts.hbs
index 75c19ba..9fed147 100644
--- a/src/partials/footer-scripts.hbs
+++ b/src/partials/footer-scripts.hbs
@@ -6,7 +6,7 @@
tocbot.init( {
tocSelector: '#article-toc',
contentSelector: 'article',
- headingSelector: 'h2, h3, h4',
+ headingSelector: 'h2, h3, h4, h5',
collapseDepth: 2,
positionFixedSelector: '#article-toc',
scrollSmooth: true,
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index 51a9365..486bc8e 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -13,7 +13,7 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Quick Start</a>
<div class="navbar-dropdown">
- <span class="navbar-item">Starter Apps</span>
+ <a class="navbar-item navbar-heading" href="/toc/quick-start.html#starter-apps">Starter Apps</a>
<a class="navbar-item" href="/helloworld/about.html">Hello World</a>
<a class="navbar-item" href="/simpleapp/about.html">Simple App</a>
</div>
@@ -21,17 +21,17 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Guides</a>
<div class="navbar-dropdown">
- <span class="navbar-item">User Guides</span>
+ <a class="navbar-item navbar-heading" href="/toc/guides.html#user-guides">User Guides</a>
<a class="navbar-item" href="/ug/about.html">Fundamentals & Beyond</a>
<a class="navbar-item" href="/demoapp/about.html">Demo App</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Reference Guides</span>
+ <a class="navbar-item navbar-heading" href="/toc/guides.html#reference-guides">Reference Guides</a>
<a class="navbar-item" href="/rg/ant/about.html">Annotations</a>
<a class="navbar-item" href="/rg/svc/about.html">Domain Services</a>
<a class="navbar-item" href="/rg/cfg/about.html">Core Config Properties</a>
<a class="navbar-item" href="/rg/cms/about.html">Classes, Methods & Schema</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Testing & Prototyping</span>
+ <a class="navbar-item navbar-heading" href="/toc/guides.html#testing-prototyping">Testing & Prototyping</a>
<a class="navbar-item" href="/testing/about.html">Unit & Integ Testing</a>
<a class="navbar-item" href="/ext-fixtures/about.html">Fixtures (extension)</a>
<a class="navbar-item" href="/ext-specsupport/about.html">BDD (extension)</a>
@@ -43,19 +43,19 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Components</a>
<div class="navbar-dropdown">
- <span class="navbar-item">Wicket Viewer</span>
+ <a class="navbar-item navbar-heading" href="/toc/components.html#wicket-viewer">Wicket Viewer</a>
<a class="navbar-item" href="/vw/about.html">User Guide</a>
<a class="navbar-item" href="/ext-viewer-wicket-excel/about.html">Excel download (extension)</a>
<a class="navbar-item" href="/ext-asciidoc/about.html">Asciidoc value type (extension)</a>
<a class="navbar-item" href="/ext-markdown/about.html">Markdown value type (extension)</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Restful Objects Viewer</span>
+ <a class="navbar-item navbar-heading" href="/toc/components.html#wicket-viewer">Restful Objects Viewer</a>
<a class="navbar-item" href="/vro/about.html">User Guide</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">DataNucleus Object Store</span>
+ <a class="navbar-item navbar-heading" href="/toc/components.html#datanucleus-object-store">DataNucleus Object Store</a>
<a class="navbar-item" href="/odn/about.html">User Guide</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Security</span>
+ <a class="navbar-item navbar-heading" href="/toc/components.html#security">Security</a>
<a class="navbar-item" href="/security/about.html">User Guide</a>
<a class="navbar-item" href="/ext-secman/about.html">SecMan (extension)</a>
</div>
@@ -63,16 +63,16 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Support</a>
<div class="navbar-dropdown">
- <span class="navbar-item">Resources</span>
+ <a class="navbar-item navbar-heading" href="/toc/support.html#resources">Resources</a>
<a class="navbar-item" href="/toc/devguide/about.html">Developers' Guide</a>
<a class="navbar-item" href="/mavendeps/about.html">Maven mixins</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Mailing Lists</span>
+ <a class="navbar-item navbar-heading" href="/toc/support.html#help">Mailing Lists</a>
<a class="navbar-item" href="/toc/mailing-list/how-to-subscribe.html">How to subscribe</a>
<a class="navbar-item" href="https://lists.apache.org/list.html?users@isis.apache.org">Archives (ASF Pony Mail)</a>
<a class="navbar-item" href="http://isis.markmail.org/search/?q=">Archives (Markmail)</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Releases</span>
+ <a class="navbar-item navbar-heading" href="/toc/support.html#releases">Releases</a>
<a class="navbar-item" href="/toc/downloads/how-to.html">Downloads</a>
<a class="navbar-item" href="/relnotes/about.html">Release Notes</a>
<a class="navbar-item" href="/mignotes/about.html">Migration Notes</a>
@@ -87,10 +87,10 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Internal</a>
<div class="navbar-dropdown">
- <span class="navbar-item">Committers</span>
+ <a class="navbar-item navbar-heading" href="/toc/internal.html#committers">Committers</a>
<a class="navbar-item" href="/toc/comguide/about.html">Committers' Guide</a>
<hr class="navbar-divider"/>
- <span class="navbar-item">Implementation</span>
+ <a class="navbar-item navbar-heading" href="/toc/internal.html#implementation">Implementation</a>
<a class="navbar-item" href="/archdesign/about.html">Architecture & Design</a>
<a class="navbar-item" href="/fis/about.html">Framework Internal Services</a>
<a class="navbar-item" href="/smoketests/about.html">SmokeTest App</a>