Merge branch 'master' for gitlab.com:antora/antora-ui-default

* e05e6f5 - Jul 11 2022 - add note that uiRootPath and siteRootPath are root-relative in the 404 page template * da14ed6 - Jul 09 2022 - only call highlightBlock on code element with data-lang attribute * 51ad811 - May 26 2022 - resolves #188 add lua as supported language in syntax highlighter * df88b37 - May 26 2022 - merge !161 * 5c71fc5 - May 26 2022 - resolves #189 add support for align=left and align=right on block image * 67d640f - May 26 2022 - add support for float-group and float-gap roles * 0a4f0a2 - Apr 28 2022 - fix font color in navbar brand element when logo is used
countableSet · Jul 19, 2022 · 9fb4fc4 · 9fb4fc4
2 parents f570e4b + e05e6f5
commit 9fb4fc4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/docs/modules/ROOT/pages/templates.adoc b/docs/modules/ROOT/pages/templates.adoc
@@ -183,9 +183,11 @@ s| siteRootPath
 | The relative path to the root of the published site.
 If a site start page is defined, the visitor will be redirected from this location to the start page.
 Can be used as a fallback when a site URL is not set.
+This value is _root-relative_ in the 404 page template, which is required for the 404 page to work correctly when served by the web server. 
 
 s| uiRootPath
 | The relative path to the root directory of the UI.
+This value is _root-relative_ in the 404 page template, which is required for the 404 page to work correctly when served by the web server. 
 
 s| antoraVersion
 | The version of Antora used to build the site (specifically the version of the @antora/page-composer package).

diff --git a/preview-src/index.adoc b/preview-src/index.adoc
@@ -6,16 +6,21 @@ Author Name
 :!table-caption:
 :page-pagination:
 
-image:multirepo-ssg.svg[Multirepo SSG,200,150,float=right]
+[.float-group]
+--
+image:multirepo-ssg.svg[Multirepo SSG,180,135,float=right,role=float-gap]
 Platonem complectitur mediocritatem ea eos.
 Ei nonumy deseruisse ius.
 Mel id omnes verear.
 Vis no velit audiam, sonet <<dependencies,praesent>> eum ne.
 *Prompta eripuit* nec ad.
 Integer diam enim, dignissim eget eros et, ultricies mattis odio.
+--
+
 Vestibulum consectetur nec urna a luctus.
 Quisque pharetra tristique arcu fringilla dapibus.
 https://example.org[Curabitur,role=unresolved] ut massa aliquam, cursus enim et, accumsan lectus.
+Mauris eget leo nunc, nec tempus mi? Curabitur id nisl mi, ut vulputate urna.
 
 == Text Formatting Tests
 
@@ -326,7 +331,7 @@ image::multirepo-ssg.svg[Multirepo SSG,3000,opts=interactive]
 Make the switch today!
 
 .Full Circle with Jake Blauvelt
-video::300817511[vimeo,600,300]
+video::300817511[vimeo,640,360,align=left]
 
 [#english+中文]
 == English + 中文
@@ -338,7 +343,8 @@ Eos suscipit scaevola at.
 ____
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 Mauris eget leo nunc, nec tempus mi? Curabitur id nisl mi, ut vulputate urna.
-Quisque porta facilisis tortor, vitae bibendum velit fringilla vitae! Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Quisque porta facilisis tortor, vitae bibendum velit fringilla vitae!
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 Mauris eget leo nunc, nec tempus mi? Curabitur id nisl mi, ut vulputate urna.
 Quisque porta facilisis tortor, vitae bibendum velit fringilla vitae!
 ____

diff --git a/src/css/doc.css b/src/css/doc.css
@@ -171,6 +171,20 @@
   float: left;
 }
 
+.doc .float-gap.right {
+  margin: 0 1rem 1rem 0;
+}
+
+.doc .float-gap.left {
+  margin: 0 0 1rem 1rem;
+}
+
+.doc .float-group::after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
 .doc .stretch {
   width: 100%;
 }
@@ -400,6 +414,16 @@
   align-items: center;
 }
 
+.doc .imageblock.text-left,
+.doc .videoblock.text-left {
+  align-items: flex-start;
+}
+
+.doc .imageblock.text-right,
+.doc .videoblock.text-right {
+  align-items: flex-end;
+}
+
 .doc .imageblock img,
 .doc .imageblock object,
 .doc .imageblock svg,

diff --git a/src/css/header.css b/src/css/header.css
@@ -27,10 +27,13 @@ body {
   padding-left: 1rem;
 }
 
+.navbar-brand .navbar-item {
+  color: var(--navbar-font-color);
+}
+
 .navbar-brand .navbar-item:first-child {
   align-self: center;
   padding: 0;
-  color: var(--navbar-font-color);
   font-size: calc(22 / var(--rem-base) * 1rem);
   flex-wrap: wrap;
   line-height: 1;

diff --git a/src/js/vendor/highlight.bundle.js b/src/js/vendor/highlight.bundle.js
@@ -18,6 +18,7 @@
   hljs.registerLanguage('json', require('highlight.js/lib/languages/json'))
   hljs.registerLanguage('kotlin', require('highlight.js/lib/languages/kotlin'))
   hljs.registerLanguage('less', require('highlight.js/lib/languages/less'))
+  hljs.registerLanguage('lua', require('highlight.js/lib/languages/lua'))
   hljs.registerLanguage('markdown', require('highlight.js/lib/languages/markdown'))
   hljs.registerLanguage('nix', require('highlight.js/lib/languages/nix'))
   hljs.registerLanguage('none', require('highlight.js/lib/languages/plaintext'))
@@ -34,7 +35,7 @@
   hljs.registerLanguage('typescript', require('highlight.js/lib/languages/typescript'))
   hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'))
   hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml'))
-  ;[].slice.call(document.querySelectorAll('pre code.hljs')).forEach(function (node) {
+  ;[].slice.call(document.querySelectorAll('pre code.hljs[data-lang]')).forEach(function (node) {
     hljs.highlightBlock(node)
   })
 })()