From ae9211d960b426491bdd046e08a228263f956106 Mon Sep 17 00:00:00 2001 From: blake Date: Thu, 24 Oct 2019 09:48:59 -0500 Subject: [PATCH] LP#1848524: various tweaks * Renamed the supplimental_ui folder for ease of understanding * UI Tweaks * Fixed README.adoc for working repo * add Next/Previous links at the bottom of the pages Signed-off-by: blake Signed-off-by: Galen Charlton --- docs-antora/README.adoc | 2 +- docs-antora/site.yml | 2 +- docs-antora/ui/src/css/footer.css | 15 +++++++ docs-antora/ui/src/css/header.css | 2 +- docs-antora/ui/src/css/vars.css | 2 +- docs-antora/ui/src/partials/article.hbs | 8 ++++ docs-antora/ui/src/partials/header-content.hbs | 7 +++- docs-antora/ui/src/partials/toolbar.hbs | 5 ++- .../ui/supplemental_ui/partials/header-content.hbs | 48 ---------------------- .../ui/{supplemental_ui => ui-lunr}/css/search.css | 0 .../{supplemental_ui => ui-lunr}/js/vendor/lunr.js | 0 .../js/vendor/search.js | 0 .../partials/footer-scripts.hbs | 0 .../partials/head-meta.hbs | 0 14 files changed, 37 insertions(+), 54 deletions(-) delete mode 100644 docs-antora/ui/supplemental_ui/partials/header-content.hbs rename docs-antora/ui/{supplemental_ui => ui-lunr}/css/search.css (100%) rename docs-antora/ui/{supplemental_ui => ui-lunr}/js/vendor/lunr.js (100%) rename docs-antora/ui/{supplemental_ui => ui-lunr}/js/vendor/search.js (100%) rename docs-antora/ui/{supplemental_ui => ui-lunr}/partials/footer-scripts.hbs (100%) rename docs-antora/ui/{supplemental_ui => ui-lunr}/partials/head-meta.hbs (100%) diff --git a/docs-antora/README.adoc b/docs-antora/README.adoc index 27ab8ac8d6..f5e6f03da9 100644 --- a/docs-antora/README.adoc +++ b/docs-antora/README.adoc @@ -4,7 +4,7 @@ [source,bash] ---- -$ git clone git://git.evergreen-ils.org/Evergreen.git +$ git clone git://git.evergreen-ils.org/working/Evergreen.git $ cd Evergreen $ git checkout collab/blake/LP1848524_antora_ize_docs ---- diff --git a/docs-antora/site.yml b/docs-antora/site.yml index 025b6f34a2..34b1a28f34 100644 --- a/docs-antora/site.yml +++ b/docs-antora/site.yml @@ -11,7 +11,7 @@ content: ui: bundle: url: ./ui/build/ui-bundle.zip - supplemental_files: ./ui/supplemental_ui + supplemental_files: ./ui/ui-lunr output: dir: /var/www/html/prod diff --git a/docs-antora/ui/src/css/footer.css b/docs-antora/ui/src/css/footer.css index 6521947c9b..de01cda36e 100644 --- a/docs-antora/ui/src/css/footer.css +++ b/docs-antora/ui/src/css/footer.css @@ -13,3 +13,18 @@ footer.footer { .footer a { color: var(--footer-link-font-color); } + +.article-footer { + width: 100%; +} + +.article-footer .article-footer-next { + float: right; + width: 35%; + text-align: right; +} + +.article-footer .article-footer-previous { + float: left; + width: 35%; +} diff --git a/docs-antora/ui/src/css/header.css b/docs-antora/ui/src/css/header.css index 8ad35280b5..c919f83fd0 100644 --- a/docs-antora/ui/src/css/header.css +++ b/docs-antora/ui/src/css/header.css @@ -228,7 +228,7 @@ body { .navbar-end { justify-content: flex-end; - margin: auto; + margin-left: auto; } .navbar-dropdown { diff --git a/docs-antora/ui/src/css/vars.css b/docs-antora/ui/src/css/vars.css index 28a9d5c889..9e92403634 100644 --- a/docs-antora/ui/src/css/vars.css +++ b/docs-antora/ui/src/css/vars.css @@ -18,7 +18,7 @@ --color-black: #000; --color-evergreen: #446129; /* fonts */ - --rem-base: 14; /* used to compute rem value from desired pixel value (e.g., calc(18 / var(--rem-base) * 1rem) = 18px) */ + --rem-base: 16; /* used to compute rem value from desired pixel value (e.g., calc(18 / var(--rem-base) * 1rem) = 18px) */ --body-font-size: 1.0625em; /* 17px */ --body-font-size--desktop: 1.125em; /* 18px */ --body-font-size--print: 0.9375em; /* 15px */ diff --git a/docs-antora/ui/src/partials/article.hbs b/docs-antora/ui/src/partials/article.hbs index 11a5117be9..293f7ac96d 100644 --- a/docs-antora/ui/src/partials/article.hbs +++ b/docs-antora/ui/src/partials/article.hbs @@ -13,5 +13,13 @@ If you typed the URL of this page manually, please double check that you entered

{{{page.title}}}

{{/if}} {{{page.contents}}} +
+
+ Previous +
+
+ Next +
+
{{/if}} diff --git a/docs-antora/ui/src/partials/header-content.hbs b/docs-antora/ui/src/partials/header-content.hbs index cd08086d81..32e99b8d27 100644 --- a/docs-antora/ui/src/partials/header-content.hbs +++ b/docs-antora/ui/src/partials/header-content.hbs @@ -1,4 +1,4 @@ -
+ diff --git a/docs-antora/ui/src/partials/toolbar.hbs b/docs-antora/ui/src/partials/toolbar.hbs index 251a51a5c0..3bdb979852 100644 --- a/docs-antora/ui/src/partials/toolbar.hbs +++ b/docs-antora/ui/src/partials/toolbar.hbs @@ -6,6 +6,9 @@ {{> breadcrumbs}} {{> page-versions}} {{#if (and page.editUrl (not page.origin.private))}} -
Edit this Page
+ {{/if}} diff --git a/docs-antora/ui/supplemental_ui/partials/header-content.hbs b/docs-antora/ui/supplemental_ui/partials/header-content.hbs deleted file mode 100644 index 36909f5ddc..0000000000 --- a/docs-antora/ui/supplemental_ui/partials/header-content.hbs +++ /dev/null @@ -1,48 +0,0 @@ - diff --git a/docs-antora/ui/supplemental_ui/css/search.css b/docs-antora/ui/ui-lunr/css/search.css similarity index 100% rename from docs-antora/ui/supplemental_ui/css/search.css rename to docs-antora/ui/ui-lunr/css/search.css diff --git a/docs-antora/ui/supplemental_ui/js/vendor/lunr.js b/docs-antora/ui/ui-lunr/js/vendor/lunr.js similarity index 100% rename from docs-antora/ui/supplemental_ui/js/vendor/lunr.js rename to docs-antora/ui/ui-lunr/js/vendor/lunr.js diff --git a/docs-antora/ui/supplemental_ui/js/vendor/search.js b/docs-antora/ui/ui-lunr/js/vendor/search.js similarity index 100% rename from docs-antora/ui/supplemental_ui/js/vendor/search.js rename to docs-antora/ui/ui-lunr/js/vendor/search.js diff --git a/docs-antora/ui/supplemental_ui/partials/footer-scripts.hbs b/docs-antora/ui/ui-lunr/partials/footer-scripts.hbs similarity index 100% rename from docs-antora/ui/supplemental_ui/partials/footer-scripts.hbs rename to docs-antora/ui/ui-lunr/partials/footer-scripts.hbs diff --git a/docs-antora/ui/supplemental_ui/partials/head-meta.hbs b/docs-antora/ui/ui-lunr/partials/head-meta.hbs similarity index 100% rename from docs-antora/ui/supplemental_ui/partials/head-meta.hbs rename to docs-antora/ui/ui-lunr/partials/head-meta.hbs -- 2.11.0