Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
Merged upstream/antora-default-ui

commit c1770077c19c43498eb53ac261a95ffdeed5fd8f
Merge: de4f1f6 8751b86
Author: Richard Attermeyer <richard.attermeyer@opitz-consulting.com>
Date:   Mon Feb 22 18:35:52 2021 +0100

    Merge remote-tracking branch 'upstream/master' into update-from-upstream

commit 8751b86
Merge: 64b526b 9489ff1
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Feb 11 08:57:40 2021 +0000

    merge !141

    resolves #165 hide toc and pagination in print styles

commit 9489ff1
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Jan 14 03:28:12 2021 -0700

    hide toc and pagination in print styles

commit 64b526b
Merge: 272989b 33979e2
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Jan 4 22:39:18 2021 +0000

    merge !138

    resolves #163 reference copy icon in source toolbox using img tag instead of svg+use

commit 33979e2
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Jan 4 02:59:48 2021 -0700

    reference copy icon in source toolbox using img tag instead of svg+use (unless configured otherwise)

commit 272989b
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Jan 4 13:24:22 2021 -0700

    further consolidate styles for navbar; remove padding on first item in navbar brand

commit c708bae
Merge: 176c013 1f697ca
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Jan 4 10:05:40 2021 +0000

    merge !137

    resolves #162 scroll panel to bring children into view when expanding nav item

commit 1f697ca
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 03:16:06 2020 -0700

    scroll panel to bring children into view when expanding nav item

commit 176c013
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Jan 4 02:48:35 2021 -0700

    add missing .doc namespace selector for items in source toolbox

commit 96f1a9f
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Jan 3 15:13:33 2021 -0700

    reorganize styles for navbar

commit 8275141
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Jan 3 14:59:02 2021 -0700

    simplify styles that control position of navbar-end

commit 80c42a6
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Jan 3 14:58:09 2021 -0700

    only set height on navbar-brand for mobile

commit fab1ea2
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 03:03:29 2020 -0700

    minor cleanups to base styles

    - only set 100% height on root element
    - only apply scrollbar globally if browsers supports scrollbar-width
    - formatting

commit 731012b
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:55:26 2020 -0700

    rename octicons.svg to octicons-16.svg and remove size suffix from IDs

commit 2c0ba24
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:50:14 2020 -0700

    add multiple classes using DOMTokenList#add method in copy to clipboard script

commit ed0ceda
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:48:23 2020 -0700

    simplify computed height for nav menu panel; use var for nav explore panel (max) height

commit ea3a1d4
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:46:15 2020 -0700

    simplify logic to expand nav explore panel

commit 80b47de
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:43:42 2020 -0700

    use variable to set width and height of nav toggle button in toolbar

commit d4a4a8b
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 30 02:41:08 2020 -0700

    define toc CSS vars after doc vars

commit 54d02ac
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 29 01:43:40 2020 -0700

    reduce space between doctitle and embedded toc

commit 533ec58
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 28 05:07:24 2020 -0700

    remove unused close icon

commit 146f78b
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 27 17:04:41 2020 -0700

    right right property on page versions menu

commit a074161
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 27 02:42:37 2020 -0700

    consistently use background instead of background-color in header

commit 43e16a9
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 27 02:38:44 2020 -0700

    remove needless style for page versions

commit 3954c12
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 16:43:50 2020 -0700

    enable page version selector on mobile

commit 618017c
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 16:35:51 2020 -0700

    allow navbar burger to shrink

commit ab4acf1
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 04:24:21 2020 -0700

    use background color instead of border for lines in navbar burger

commit dea12e6
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 04:09:51 2020 -0700

    redo navbar burger using flexbox and add transition on close

commit 7ada23f
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 03:15:36 2020 -0700

    fix alignment of burger area and use rem unit for width of bars

commit 4e86fad
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 26 03:13:23 2020 -0700

    simplify header styles; remove redundant properties

commit 6980090
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 24 19:41:53 2020 -0700

    remove unused CSS

commit 5abd59d
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 24 19:41:24 2020 -0700

    don't use flexbox for nav menu; style top of sibling list instead of bottom

commit 9aabc3a
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 24 19:35:12 2020 -0700

    style scrollbars in body uniformly

commit ea34146
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 23 14:36:52 2020 -0700

    add support for nobreak and nowrap utility roles

commit 58d9384
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 23 14:31:43 2020 -0700

    use correct value for max height of navbar menu on mobile

commit 1aa2d82
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 23 03:30:39 2020 -0700

    restrict link around home to icon

commit 7aabf63
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 23 03:24:07 2020 -0700

    link home icon size to toolbar height

commit e0c1dd6
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 22 14:30:07 2020 -0700

    use order instead of row-reverse to swap article and toc

commit cec886f
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 22 14:18:06 2020 -0700

    insert toc before article and swap position w/ flexbox to avoid reflow on load

commit e5d2832
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 22 04:32:21 2020 -0700

    remove -webkit-text-size-adjust property on html since it's not applicable

commit 114cdc3
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 22 02:25:04 2020 -0700

    pass radix to parseInt function (to avoid unnecessary checks and unwanted side effects)

commit 5156894
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:46:09 2020 -0700

    add .5px to max-width media queries to ensure a smooth transition

commit 34395c3
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:42:01 2020 -0700

    flatten comment in script

commit e5b2668
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:36:13 2020 -0700

    use test instead of match when looking for section in nav script

commit 6e5903c
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:25:13 2020 -0700

    predefine regular expressions in JavaScript functions

commit b915a98
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:23:05 2020 -0700

    fix missing replacement for line continaution in copy to clipboard script

commit fb55996
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:20:27 2020 -0700

    make correction for view height when opening navbar menu on mobile

commit d84a9d2
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:13:08 2020 -0700

    refactor logic for navbar burger to align with other scripts

commit cb007c0
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:00:29 2020 -0700

    don't override behavior of modified clicks in fragment jumper

commit 27c4a4f
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 17:00:22 2020 -0700

    consolidate code in fragment jumper

commit 805c1f6
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 16:33:00 2020 -0700

    minor refactoring

commit 0a9f1f9
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 20 16:04:57 2020 -0700

    rename concealEvent to trapEvent

commit 13fd790
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 17 03:37:54 2020 -0700

    limit hdlist styles to hdlist and add space between entries

commit 20795ba
Merge: 5b42b44 99cab24
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 15 19:35:17 2020 +0000

    merge !136

    add back syntax highlighting for diff

commit 99cab24
Author: Pierre Radermecker <pierrer@pi3r.be>
Date:   Tue Dec 15 16:12:36 2020 +0100

    add back syntax highlighting for diff

commit 5b42b44
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 14 18:33:43 2020 -0700

    remove lesser used languages from highlight.js bundle (diff, makefile)

    - reenable upon request

commit eb7e8a9
Merge: 2938959 f4c719d
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 15 01:30:08 2020 +0000

    merge !135

    add syntax highlighting for Puppet

commit f4c719d
Author: Pierre Radermecker <pierrer@pi3r.be>
Date:   Sun Dec 13 20:39:45 2020 +0100

    add syntax highlighting for Puppet

commit 2938959
Merge: 7c69c4a ed4701c
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 13 07:41:39 2020 +0000

    merge !134

    resolves #156 style table footer

commit ed4701c
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 13 00:29:19 2020 -0700

    style table footer

commit 7c69c4a
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 23:55:13 2020 -0700

    tweak layout for page versions

commit 1bb438f
Merge: f723a52 b66ee45
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Dec 13 02:21:47 2020 +0000

    merge !133

    resolves #75 fix selector for page versions when version overflows

commit b66ee45
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 18:12:25 2020 -0700

    fix selector for page versions when version overflows

commit f723a52
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 17:03:40 2020 -0700

    contrain main content on mobile to prevent breaking layout

commit 927a7af
Merge: dd7bc5b 523899e
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 23:46:18 2020 +0000

    merge !132

    resolves #160 adjust height of nav panel when activating, if necessary

commit 523899e
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 16:27:48 2020 -0700

    adjust height of nav panel when activating, if necessary

commit dd7bc5b
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 15:53:28 2020 -0700

    remove used style for p in table

commit f152f03
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 03:42:35 2020 -0700

    define uiRootPath var in head instead of footer

commit eb9e41f
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 03:10:52 2020 -0700

    lock version of highlight.js to 9.18.3 to avoid upgrade nag message

commit afc3ee6
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 03:09:33 2020 -0700

    refresh dependency lock file

commit 049d88c
Merge: e66421a 813c2fd
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 10:07:06 2020 +0000

    merge !131

    resolves #159 add support for stripes attribute on table

commit 813c2fd
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 03:01:45 2020 -0700

    add support for stripes attribute on table

commit e66421a
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:56:12 2020 -0700

    use top-oriented approach to add margin to table; remove top margin on table when first child in AsciiDoc table cell

commit 2011029
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:46:59 2020 -0700

    fix vertical alignment of images

commit 00992a6
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:44:54 2020 -0700

    move override for p in table to tableblock section

commit a6495f5
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:43:25 2020 -0700

    make the stretch role generic

commit c0f3fd0
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:41:45 2020 -0700

    move user select for language-console below source toolbar in stylesheet

commit f004b4d
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Dec 11 20:33:33 2020 -0700

    strip trailing space (left behind by callouts) when copying source

commit 61185ad
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Dec 11 20:33:01 2020 -0700

    correctly flatten command with line continuation when copying

commit 7952436
Merge: 96d0998 1a66a0d
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 12 02:37:09 2020 +0000

    merge !130

    resolves #70 add copy to clipboard button to source blocks

commit 1a66a0d
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 10 17:57:57 2020 -0700

    add copy to clipboard button to source blocks

    * add subsetted SVG icon sprite for octicons
    * add copy to clipboard button to source blocks (visible on hover)
    * replace pseudo-element for source language with a toolbox (managed by JavaScript)
    * autodetect literal block with command and promote to a console source block
    * intelligently extract commands from console source block, flatten them, and join them in a chain
    * prevent command prompt(s) in console source block from being selected
    * darken color for annotation on source block
    * configure svgo to preserve desc element
    * configure svgo to preserve ID prefixes for icons

commit 96d0998
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 10 16:11:22 2020 -0700

    fix word-wrap (aka overflow-wrap) setting

    - enable word-wrap anywhere by default
    - disable word-wrap (reset to normal) in tables (except content cell of admonition table)

commit 26dfb7f
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 10 15:50:13 2020 -0700

    set border-collapse on table in CSS reset

commit 25de8a1
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Dec 10 15:44:59 2020 -0700

    add styles for the horizontal dlist

commit 1c274ed
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 8 17:07:17 2020 -0700

    offer a way back in the message on the 404 page

commit 0706e75
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 8 17:00:37 2020 -0700

    move article tag for 404 to separate partial

commit e536e93
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 8 16:48:54 2020 -0700

    add ne helper and use it for negated equality test

commit 7175cbb
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 8 16:44:31 2020 -0700

    expand explore panel on 404 page

commit 72f72e8
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 7 04:44:30 2020 -0700

    make component title in component drawer a link

commit 23b175e
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 7 04:38:15 2020 -0700

    remove trailing spaces in UI model for preview

commit 4541137
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 7 04:32:31 2020 -0700

    use pseudo-element to position caret next to version on explore drawer

commit ae3b839
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Dec 7 03:05:00 2020 -0700

    make sure name of component 123 is a string in UI model for preview

commit 8e015f2
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Dec 5 04:50:40 2020 -0700

    fix build to copy images when running preview

commit a1ba0b1
Merge: 4d8fb5e a95e628
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 2 09:33:20 2020 +0000

    merge !129

    resolves #158 use more specific selector for on this page component

commit a95e628
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Dec 2 02:25:34 2020 -0700

    use more specific selector for on this page component

commit 4d8fb5e
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 1 18:48:36 2020 -0700

    don't run imagemin for preview

commit cc7694d
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 1 18:22:20 2020 -0700

    add top margin to details block (forward looking)

commit 34353c1
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 1 18:21:44 2020 -0700

    style thematic break

commit e7ac619
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 1 18:20:43 2020 -0700

    increase font size for lead paragraph

commit 4314cee
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Dec 1 18:19:24 2020 -0700

    clear built-in margin on dl tag

commit a41dd92
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Nov 29 02:18:36 2020 -0700

    remove top margin from first child in AsciiDoc table cell and admonition content

commit a8e4145
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Nov 28 17:37:35 2020 -0700

    fix reducer that computes mtime for combined CSS file

commit 38db551
Merge: eb83a5b 915cfd6
Author: Dan Allen <dan@opendevise.com>
Date:   Sun Nov 29 00:30:18 2020 +0000

    merge !128

    resolves #26 add support for unordered list styles and some missing ordered list styles

commit 915cfd6
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Nov 28 03:19:23 2020 -0700

    add support for unordered list styles and some missing ordered list styles

    * support the following unordered list styles: circle, disc, square, none, no-bullet, unstyled
    * support the following ordered list styles: none, unnumbered, unstyled

commit eb83a5b
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Nov 19 15:43:21 2020 -0700

    remove irrelevant condition in breadcrumbs partial

commit bafd311
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Nov 19 15:43:05 2020 -0700

    fix navigation in preview site

commit fa6fd26
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Nov 17 01:11:08 2020 -0700

    clarify in docs that page.home means the site start page

commit c18b14c
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Nov 11 14:59:23 2020 -0700

    fix reducer that computes mtime for bundled file

commit 58a6985
Author: Dan Allen <dan@opendevise.com>
Date:   Tue Nov 10 12:10:11 2020 -0700

    document the page.relativeSrcPath property

commit b646ca2
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Nov 7 03:15:43 2020 -0700

    define page.relativeSrcPath in preview model

commit 2fee313
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Nov 6 16:26:34 2020 -0700

    also compile and bundle vendor CSS

commit afc24e5
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Nov 6 15:15:36 2020 -0700

    make error event in preview:build task correctly

commit 75d1814
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Nov 6 15:08:12 2020 -0700

    refresh dependency lock file

commit 8e09c1d
Author: Dan Allen <dan@opendevise.com>
Date:   Fri Nov 6 14:50:11 2020 -0700

    drop through2 dependency

    use native stream.Transform instead

commit 0570838
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Nov 5 18:09:12 2020 -0700

    add unresolved link example to preview site

commit 0b62b73
Author: Dan Allen <dan@opendevise.com>
Date:   Wed Nov 4 15:17:38 2020 -0700

    add "Regular" to name of local Roboto Mono Regular font

commit ad04894
Author: Dan Allen <dan@opendevise.com>
Date:   Mon Nov 2 17:36:34 2020 -0700

    add missing word in README

commit 4f54fb8
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Sep 24 16:58:05 2020 -0600

    add missing closing bracket

commit 7f9ea3c
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Sep 24 16:52:52 2020 -0600

    replace reference to latestVersion property with latest

commit 297f59d
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Sep 17 03:15:32 2020 -0600

    apply correct styles to literal table cell

    - drop border, background, and padding

commit 56b17ab
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Sep 17 03:10:19 2020 -0600

    apply correct (minimal) styles to verse block

commit 1c0b403
Merge: 650b6a7 621d358
Author: Dan Allen <dan@opendevise.com>
Date:   Thu Sep 17 01:14:04 2020 +0000

    merge !123

    resolves #150 only highlight code tags that have the hljs class

commit 621d358
Author: Dan Allen <dan@opendevise.com>
Date:   Sat Sep 12 15:48:54 2020 -0600

    only highlight code tags that have the hljs class
  • Loading branch information
rattermeyer committed Feb 22, 2021
1 parent de4f1f6 commit 11d2e04
Show file tree
Hide file tree
Showing 38 changed files with 700 additions and 495 deletions.
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Read on to learn how to customize the default UI for your own documentation.
== Development Quickstart

This section offers a basic tutorial to teach you how to set up the default UI project, preview it locally, and bundle it for use with Antora.
A more comprehensive can be found in the documentation at {url-antora-docs}.
A more comprehensive tutorial can be found in the documentation at {url-antora-docs}.

=== Prerequisites

Expand Down
5 changes: 4 additions & 1 deletion docs/modules/ROOT/pages/templates.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ Properties include name (since 2.3), version, displayVersion, prerelease (if set
| page.module
| The name of the module for the current page.

| page.relativeSrcPath
| The path of the current page relative to the pages directory in the current module (since 2.3).

| page.version
| The name of the version for the current page.

Expand Down Expand Up @@ -149,7 +152,7 @@ A quick way to force this property to be `true` (even if the repository is publi
Then, the "Edit the Page" link will not appear.

| page.home
| Indicates whether the current page is the home page of the site.
| Indicates whether the current page is the start (aka home) page of the site.

| page.layout
| The page layout for the current page.
Expand Down
3 changes: 2 additions & 1 deletion gulp.d/lib/gulp-prettier-eslint.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use strict'

const log = require('fancy-log')
const { obj: map } = require('through2')
const PluginError = require('plugin-error')
const prettierEslint = require('prettier-eslint')
const { Transform } = require('stream')
const map = (transform) => new Transform({ objectMode: true, transform })

module.exports = () => {
const report = { changed: 0, unchanged: 0 }
Expand Down
5 changes: 3 additions & 2 deletions gulp.d/tasks/build-preview-pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ Error.call = (self, ...args) => {
const asciidoctor = require('asciidoctor.js')()
const fs = require('fs-extra')
const handlebars = require('handlebars')
const { obj: map } = require('through2')
const merge = require('merge-stream')
const ospath = require('path')
const path = ospath.posix
const requireFromString = require('require-from-string')
const { Transform } = require('stream')
const map = (transform = () => {}, flush = undefined) => new Transform({ objectMode: true, transform, flush })
const vfs = require('vinyl-fs')
const yaml = require('js-yaml')

Expand Down Expand Up @@ -62,7 +63,7 @@ module.exports = (src, previewSrc, previewDest, sink = () => map()) => (done) =>
})
)
.pipe(vfs.dest(previewDest))
.on('error', (e) => done)
.on('error', done)
.pipe(sink())
)

Expand Down
28 changes: 18 additions & 10 deletions gulp.d/tasks/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const concat = require('gulp-concat')
const cssnano = require('cssnano')
const fs = require('fs-extra')
const imagemin = require('gulp-imagemin')
const { obj: map } = require('through2')
const merge = require('merge-stream')
const ospath = require('path')
const path = ospath.posix
Expand All @@ -16,6 +15,9 @@ const postcssCalc = require('postcss-calc')
const postcssImport = require('postcss-import')
const postcssUrl = require('postcss-url')
const postcssVar = require('postcss-custom-properties')
const { Transform } = require('stream')
const map = (transform) => new Transform({ objectMode: true, transform })
const through = () => map((file, enc, next) => next(null, file))
const uglify = require('gulp-uglify')
const vfs = require('vinyl-fs')

Expand All @@ -30,7 +32,7 @@ module.exports = (src, dest, preview) => () => {
.reduce((accum, { file: depPath, type }) => (type === 'dependency' ? accum.concat(depPath) : accum), [])
.map((importedPath) => fs.stat(importedPath).then(({ mtime }) => mtime))
).then((mtimes) => {
const newestMtime = mtimes.reduce((max, curr) => (!max || curr > max ? curr : max))
const newestMtime = mtimes.reduce((max, curr) => (!max || curr > max ? curr : max), file.stat.mtime)
if (newestMtime > file.stat.mtime) file.stat.mtimeMs = +(file.stat.mtime = newestMtime)
}),
postcssUrl([
Expand Down Expand Up @@ -75,7 +77,7 @@ module.exports = (src, dest, preview) => () => {
})
.bundle((bundleError, bundleBuffer) =>
Promise.all(mtimePromises).then((mtimes) => {
const newestMtime = mtimes.reduce((max, curr) => (!max || curr > max ? curr : max))
const newestMtime = mtimes.reduce((max, curr) => (curr > max ? curr : max), file.stat.mtime)
if (newestMtime > file.stat.mtime) file.stat.mtimeMs = +(file.stat.mtime = newestMtime)
if (bundleBuffer !== undefined) file.contents = bundleBuffer
file.path = file.path.slice(0, file.path.length - 10) + '.js'
Expand All @@ -95,21 +97,27 @@ module.exports = (src, dest, preview) => () => {
// NOTE use this statement to bundle a JavaScript library that cannot be browserified, like jQuery
//vfs.src(require.resolve('<package-name-or-require-path>'), opts).pipe(concat('js/vendor/<library-name>.js')),
vfs
.src('css/site.css', { ...opts, sourcemaps })
.src(['css/site.css', 'css/vendor/*.css'], { ...opts, sourcemaps })
.pipe(postcss((file) => ({ plugins: postcssPlugins, options: { file } }))),
vfs.src('font/*.{ttf,woff*(2)}', opts),
vfs
.src('img/**/*.{gif,ico,jpg,png,svg}', opts)
.pipe(
imagemin(
vfs.src('img/**/*.{gif,ico,jpg,png,svg}', opts).pipe(
preview
? through()
: imagemin(
[
imagemin.gifsicle(),
imagemin.jpegtran(),
imagemin.optipng(),
imagemin.svgo({ plugins: [{ removeViewBox: false }] }),
imagemin.svgo({
plugins: [
{ cleanupIDs: { preservePrefixes: ['icon-', 'view-'] } },
{ removeViewBox: false },
{ removeDesc: false },
],
}),
].reduce((accum, it) => (it ? accum.concat(it) : accum), [])
)
),
),
vfs.src('helpers/*.js', opts),
vfs.src('layouts/*.hbs', opts),
vfs.src('partials/*.hbs', opts)
Expand Down
3 changes: 2 additions & 1 deletion gulp.d/tasks/remove.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
'use strict'

const fs = require('fs-extra')
const { obj: map } = require('through2')
const { Transform } = require('stream')
const map = (transform) => new Transform({ objectMode: true, transform })
const vfs = require('vinyl-fs')

module.exports = (files) => () =>
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"gulp-uglify": "~3.0",
"gulp-vinyl-zip": "~2.2",
"handlebars": "~4.7",
"highlight.js": "~9.18",
"highlight.js": "9.18.3",
"js-yaml": "~3.13",
"merge-stream": "~2.0",
"postcss-calc": "~7.0",
Expand All @@ -49,7 +49,6 @@
"require-from-string": "~2.0",
"stylelint": "~13.3",
"stylelint-config-standard": "~20.0",
"through2": "~3.0",
"typeface-roboto": "0.0.75",
"typeface-roboto-mono": "0.0.75",
"vinyl-buffer": "~1.0",
Expand Down
51 changes: 49 additions & 2 deletions preview-src/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Vis no velit audiam, sonet <<dependencies,praesent>> eum ne.
Integer diam enim, dignissim eget eros et, ultricies mattis odio.
Vestibulum consectetur nec urna a luctus.
Quisque pharetra tristique arcu fringilla dapibus.
Curabitur ut massa aliquam, cursus enim et, accumsan lectus.
https://example.org[Curabitur,role=unresolved] ut massa aliquam, cursus enim et, accumsan lectus.

== Cu solet

Expand Down Expand Up @@ -69,6 +69,15 @@ vfs
<2> Wrap each streaming file in a buffer so the files can be processed by uglify.
Uglify can only work with buffers, not streams.

Execute these commands to validate and build your site:

$ podman run -v $PWD:/antora:Z --rm -t antora/antora \
version
3.0.0
$ podman run -v $PWD:/antora:Z --rm -it antora/antora \
--clean \
antora-playbook.yml

Cum dicat #putant# ne.
Est in <<inline,reque>> homero principes, meis deleniti mediocrem ad has.
Altera atomorum his ex, has cu elitr melius propriae.
Expand All @@ -85,6 +94,22 @@ src/
HelloWorldTest.java
....

Eu mea munere vituperata constituam.

[%autowidth]
|===
|Input | Output | Example

m|"foo\nbar"
l|foo
bar
a|
[source,ruby]
----
puts "foo\nbar"
----
|===

Select menu:File[Open Project] to open the project in your IDE.
Per ea btn:[Cancel] inimicus.
Ferri kbd:[F11] tacimates constituam sed ex, eu mea munere vituperata kbd:[Ctrl,T] constituam.
Expand All @@ -105,13 +130,15 @@ No sea, at invenire voluptaria mnesarchum has.
Ex nam suas nemore dignissim, vel apeirian democritum et.
At ornatus splendide sed, phaedrum omittantur usu an, vix an noster voluptatibus.

[upperalpha]
. potenti donec cubilia tincidunt
. etiam pulvinar inceptos velit quisque aptent himenaeos
. lacus volutpat semper porttitor aliquet ornare primis nulla enim

Natum facilisis theophrastus an duo.
No sea, at invenire voluptaria mnesarchum has.

[square]
* ultricies sociosqu tristique integer
* lacus volutpat semper porttitor aliquet ornare primis nulla enim
* etiam pulvinar inceptos velit quisque aptent himenaeos
Expand All @@ -130,10 +157,19 @@ splendide sed
mea::
agam graeci

Let's look at that another way.

[horizontal]
sed::
splendide sed

mea::
agam graeci

At ornatus splendide sed.

.Library dependencies
[#dependencies%autowidth]
[#dependencies%autowidth%footer,stripes=hover]
|===
|Library |Version

Expand All @@ -154,6 +190,9 @@ At ornatus splendide sed.

|jscs
|^2.3.5

h|Total
|6
|===

Cum dicat putant ne.
Expand Down Expand Up @@ -232,6 +271,14 @@ 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.

[verse]
____
The fog comes
on little cat feet.
____

== Fin

That's all, folks!
15 changes: 8 additions & 7 deletions preview-src/ui-model.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
antoraVersion: '1.0.0'
site:
url: http://localhost:5252
key: mbp
title: My Beautiful Project
title: Brand Docs
homeUrl: &home_url /xyz/5.2/index.html
components:
- name: abc
title: Component ABC
title: Project ABC
url: '#'
versions:
- &latest_version_abc
Expand All @@ -19,14 +18,15 @@ site:
latestVersion: *latest_version_abc
- &component
name: xyz
title: Component XYZ
title: &component_title Project XYZ
url: /xyz/6.0/index.html
versions:
- &latest_version_xyz
url: /xyz/6.0/index.html
version: '6.0'
displayVersion: '6.0'
- &component_version
title: *component_title
url: '#'
version: '5.2'
displayVersion: '5.2'
Expand All @@ -37,8 +37,8 @@ site:
version: '5.0'
displayVersion: '5.0'
latestVersion: *latest_version_xyz
- name: 123
title: Component 123
- name: '123'
title: Project 123
url: '#'
versions:
- &latest_version_123
Expand All @@ -61,6 +61,7 @@ page:
version: '5.2'
displayVersion: '5.2'
module: ROOT
relativeSrcPath: index.adoc
editUrl: http://example.com/project-xyz/blob/master/index.adoc
origin:
private: false
Expand Down Expand Up @@ -95,7 +96,7 @@ page:
url: '#'
navigation:
- root: true
content: Component XYZ
content: Project XYZ
url: '#'
urlType: fragment
items:
Expand Down
Loading

0 comments on commit 11d2e04

Please sign in to comment.