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 2020/03/06 15:16:17 UTC
[isis-antora] branch master updated: adds nav-pagination,
fixes some bad links in top menu
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
The following commit(s) were added to refs/heads/master by this push:
new a2eb4f4 adds nav-pagination, fixes some bad links in top menu
a2eb4f4 is described below
commit a2eb4f40e43e70be5bf9aac15008865ed75d4c36
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 6 15:16:01 2020 +0000
adds nav-pagination, fixes some bad links in top menu
---
build/ui-bundle.zip | Bin 315084 -> 323885 bytes
src/css/extensions/margins.css | 3 ---
src/css/nav.css | 48 +++++++++++++++++++++++++++++++++++++--
src/css/site.css | 1 -
src/css/vars.css | 5 ++--
src/img/arrow-down.png | Bin 0 -> 1206 bytes
src/img/arrow-left.png | Bin 0 -> 1306 bytes
src/img/arrow-right.png | Bin 0 -> 1286 bytes
src/img/arrow-up.png | Bin 0 -> 1222 bytes
src/partials/footer-content.hbs | 2 +-
src/partials/head-pagination.hbs | 13 +++++++++++
src/partials/head.hbs | 1 +
src/partials/header-content.hbs | 12 +++++-----
src/partials/nav-pagination.hbs | 18 +++++++++++++++
src/partials/nav.hbs | 1 +
15 files changed, 89 insertions(+), 15 deletions(-)
diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
index 7a2100e..fb1908b 100644
Binary files a/build/ui-bundle.zip and b/build/ui-bundle.zip differ
diff --git a/src/css/extensions/margins.css b/src/css/extensions/margins.css
deleted file mode 100644
index 24f9f29..0000000
--- a/src/css/extensions/margins.css
+++ /dev/null
@@ -1,3 +0,0 @@
-div.nav-container aside.nav .panels {
- padding-top: 3rem;
-}
diff --git a/src/css/nav.css b/src/css/nav.css
index 74f7c8f..92f16e1 100644
--- a/src/css/nav.css
+++ b/src/css/nav.css
@@ -103,7 +103,7 @@ html.is-clipped--nav {
flex-grow: 1;
min-height: 0;
width: 100%;
- padding: 0.5rem 0.75rem;
+ padding: 1rem 0.75rem;
line-height: var(--nav-line-height);
position: relative;
}
@@ -111,7 +111,7 @@ html.is-clipped--nav {
.nav-menu h3.title {
color: var(--nav-heading-font-color);
font-size: inherit;
- font-weight: var(--body-font-weight-bold);
+ font-weight: var(--body-font-weight-normal);
margin: 0;
padding: 0.25em 0 0.125em;
}
@@ -195,6 +195,50 @@ html.is-clipped--nav {
height: var(--drawer-height);
}
+.nav-panel-pagination {
+ display: flex;
+ align-items: center;
+ margin-left: 10px;
+ height: var(--toolbar-height);
+}
+
+.nav-panel-pagination a span {
+ background-repeat: no-repeat;
+ background-position: right 0.5rem top 50%;
+ background-size: auto 1em;
+ padding: 0 1.5rem 0 0;
+ margin-right: 15px;
+}
+
+.nav-panel-pagination a.page-previous span {
+ background-image: url(../img/arrow-left.png);
+}
+
+.nav-panel-pagination a.page-previous.disabled span {
+ background-image: url(../img/arrow-left-disabled.png);
+}
+
+.nav-panel-pagination a.page-next span {
+ background-image: url(../img/arrow-right.png);
+}
+
+.nav-panel-pagination a.page-next.disabled span {
+ background-image: url(../img/arrow-right-disabled.png);
+}
+
+.nav-panel-pagination a.page-parent span {
+ background-image: url(../img/arrow-up.png);
+}
+
+.nav-panel-pagination a.page-parent.disabled span {
+ background-image: url(../img/arrow-up-disabled.png);
+}
+
+.nav-panel-pagination a.disabled {
+ pointer-events: none;
+ cursor: default;
+}
+
.nav-panel-explore .context .version {
background-image: url(../img/chevron.svg);
background-repeat: no-repeat;
diff --git a/src/css/site.css b/src/css/site.css
index aa37855..bdd0f3a 100644
--- a/src/css/site.css
+++ b/src/css/site.css
@@ -20,7 +20,6 @@
@import "menu-styling.css";
@import "admonitions.css";
@import "extensions/toc.css";
-@import "extensions/margins.css";
@import "extensions/colors.css";
@import "extensions/body.css";
@import "extensions/footer-content.css";
diff --git a/src/css/vars.css b/src/css/vars.css
index d111aba..b9755ec 100644
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@ -29,9 +29,10 @@
--body-line-height: 1.15;
--body-font-color: var(--color-jet-70);
--body-font-family: "Open Sans", "DejaVu Sans", sans-serif;
- --body-font-weight-bold: 500;
+ --body-font-weight-normal: 500;
+ --body-font-weight-bold: 800;
--monospace-font-family: "Roboto Mono", monospace;
- --monospace-font-weight-bold: 500;
+ --monospace-font-weight-bold: 800;
/* base */
--body-background: var(--color-white);
--panel-background: var(--color-smoke-10);
diff --git a/src/img/arrow-down.png b/src/img/arrow-down.png
new file mode 100644
index 0000000..8dd1166
Binary files /dev/null and b/src/img/arrow-down.png differ
diff --git a/src/img/arrow-left.png b/src/img/arrow-left.png
new file mode 100644
index 0000000..c811990
Binary files /dev/null and b/src/img/arrow-left.png differ
diff --git a/src/img/arrow-right.png b/src/img/arrow-right.png
new file mode 100644
index 0000000..e76e65c
Binary files /dev/null and b/src/img/arrow-right.png differ
diff --git a/src/img/arrow-up.png b/src/img/arrow-up.png
new file mode 100644
index 0000000..4f90659
Binary files /dev/null and b/src/img/arrow-up.png differ
diff --git a/src/partials/footer-content.hbs b/src/partials/footer-content.hbs
index 136646d..2329e04 100644
--- a/src/partials/footer-content.hbs
+++ b/src/partials/footer-content.hbs
@@ -2,7 +2,7 @@
<div class="content">
<div class="copyright">
<p>
- Copyright © 2010~2019 The Apache Software Foundation, licensed under the Apache License, v2.0.
+ Copyright © 2010~2020 The Apache Software Foundation, licensed under the Apache License, v2.0.
<br/>
Apache, the Apache feather logo, Apache Isis, and the Apache Isis project logo are all trademarks of The Apache Software Foundation.
</p>
diff --git a/src/partials/head-pagination.hbs b/src/partials/head-pagination.hbs
new file mode 100644
index 0000000..50cc0a6
--- /dev/null
+++ b/src/partials/head-pagination.hbs
@@ -0,0 +1,13 @@
+<link rel="home" href="{{or site.url (or siteRootUrl siteRootPath)}}" title="{{site.title}}">
+{{#if page.next}}
+ <link rel="next" href="
+ {{~#if (eq page.next.urlType 'internal')}}{{{relativize @root.page.url page.next.url}}}
+ {{~else}}{{{page.next.url}}}
+ {{~/if}}" title="{{page.next.content}}">
+{{/if}}
+{{#if page.previous}}
+ <link rel="prev" href="
+ {{~#if (eq page.previous.urlType 'internal')}}{{{relativize @root.page.url page.previous.url}}}
+ {{~else}}{{{page.previous.url}}}
+ {{~/if}}" title="{{page.previous.content}}">
+{{/if}}
diff --git a/src/partials/head.hbs b/src/partials/head.hbs
index 7dd18b2..ba0c1eb 100644
--- a/src/partials/head.hbs
+++ b/src/partials/head.hbs
@@ -3,5 +3,6 @@
{{> head-info}}
{{> head-styles}}
{{> head-meta}}
+{{> head-pagination}}
{{> head-scripts}}
{{> head-icons}}
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index df105dc..0de0147 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -23,7 +23,7 @@
<a class="navbar-item" href="{{siteRootPath}}/docs/starters/simpleapp.html">Simple App</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Demos & Tutorials</span>
- <a class="navbar-item" href="{{siteRootPath}}/docs/demoapp/about.html">Demo App</a>
+ <a class="navbar-item" href="{{siteRootPath}}/docs/demo/about.html">Demo App</a>
<a class="navbar-item" href="https://danhaywood.gitlab.io/isis-petclinic-tutorial-docs/petclinic/1.16.2/intro.html">Petclinic (tutorial)</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Resources</span>
@@ -35,7 +35,7 @@
<a class="navbar-link" href="#">Guides</a>
<div class="navbar-dropdown">
<span class="navbar-item navbar-heading">Development</span>
- <a class="navbar-item" href="{{siteRootPath}}/docs/setupguide/about.html">Setup Guide</a>
+ <a class="navbar-item" href="{{siteRootPath}}/setupguide/about.html">Setup Guide</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Core</span>
<a class="navbar-item" href="{{siteRootPath}}/userguide/about.html">User Guide</a>
@@ -47,7 +47,7 @@
<a class="navbar-link" href="#">Libraries</a>
<div class="navbar-dropdown">
<span class="navbar-item navbar-heading">For Use in Apps</span>
- <a class="navbar-item" href="{{siteRootPath}}/subdomain/about.html">Subdomain Libraries</a>
+ <a class="navbar-item" href="{{siteRootPath}}/subdomains/about.html">Subdomain Libraries</a>
<a class="navbar-item" href="{{siteRootPath}}/valuetypes/about.html">Value Types</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Integrate between Apps</span>
@@ -69,7 +69,7 @@
<a class="navbar-item" href="{{siteRootPath}}/security/about.html">Security Guide</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Persistence</span>
- <a class="navbar-item" href="{{siteRootPath}}/odn/about.html">DataNucleus (JDO)</a>
+ <a class="navbar-item" href="{{siteRootPath}}/pjdo/about.html">DataNucleus (JDO)</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Extensions</span>
<a class="navbar-item" href="{{siteRootPath}}/extensions/about.html">Extensions Catalog</a>
@@ -89,8 +89,8 @@
<a class="navbar-item" href="{{siteRootPath}}/relnotes/about.html">Release Notes</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Framework</span>
- <a class="navbar-item" href="{{siteRootPath}}/docs/conguide/about.html">Contributors' Guide</a>
- <a class="navbar-item" href="{{siteRootPath}}/docs/comguide/about.html">Committers' Guide</a>
+ <a class="navbar-item" href="{{siteRootPath}}/conguide/about.html">Contributors' Guide</a>
+ <a class="navbar-item" href="{{siteRootPath}}/comguide/about.html">Committers' Guide</a>
<a class="navbar-item" href="{{siteRootPath}}/core/about.html">Core Design</a>
</div>
</div>
diff --git a/src/partials/nav-pagination.hbs b/src/partials/nav-pagination.hbs
new file mode 100644
index 0000000..1323e06
--- /dev/null
+++ b/src/partials/nav-pagination.hbs
@@ -0,0 +1,18 @@
+<div class="nav-panel-pagination">
+ <a class="page-previous{{#if (not page.previous)}} disabled{{/if}}" rel="prev" href="
+ {{~#if (eq page.previous.urlType 'internal')}}{{{relativize @root.page.url page.previous.url}}}
+ {{~else}}{{{page.previous.url}}}
+ {{~/if}}" title="{{page.previous.content}}"><span></span></a>
+ <a class="page-next{{#if (not page.next)}} disabled{{/if}}" rel="next"
+ href="
+ {{~#if (eq page.next.urlType 'internal')}}{{{relativize @root.page.url page.next.url}}}
+ {{~else}}{{{page.next.url}}}
+ {{~/if}}" title="{{page.next.content}}"><span></span></a>
+<!--
+page.parent doesn't seem to be set...
+ <a class="page-parent{{#if (not page.parent)}} disabled{{/if}}" rel="prev" href="
+ {{~#if (eq page.parent.urlType 'internal')}}{{{relativize @root.page.url page.parent.url}}}
+ {{~else}}{{{page.parent.url}}}
+ {{~/if}}" title="{{page.previous.content}}"><span></span></a>
+-->
+</div>
diff --git a/src/partials/nav.hbs b/src/partials/nav.hbs
index 7e0f091..9220772 100644
--- a/src/partials/nav.hbs
+++ b/src/partials/nav.hbs
@@ -1,6 +1,7 @@
<div class="nav-container"{{#if page.component}} data-component="{{page.component.name}}" data-version="{{page.version}}"{{/if}}>
<aside class="nav">
<div class="panels">
+{{> nav-pagination}}
{{> nav-menu}}
{{> nav-explore}}
</div>