diff --git a/assets/_markdown.scss b/assets/_markdown.scss index 2844d22..466a1d5 100644 --- a/assets/_markdown.scss +++ b/assets/_markdown.scss @@ -8,12 +8,12 @@ $block-border-radius: 0.15rem; h1, h2, h3, h4, h5 { font-weight: 400; line-height: 1.25; + } - // remove padding at the beginning of page - &> :first-child { - margin-top: 0; - line-height: 1em; - } + // remove padding at the beginning of page + > :first-child { + margin-top: 0; + line-height: 1; } b, optgroup, strong { @@ -72,4 +72,10 @@ $block-border-radius: 0.15rem; background: $gray-100; } } + + hr { + height: $padding-1; + border: none; + background: $gray-200; + } } diff --git a/assets/_shortcode.scss b/assets/_shortcode.scss index 3174bc4..db62617 100644 --- a/assets/_shortcode.scss +++ b/assets/_shortcode.scss @@ -1,10 +1,10 @@ @import "variables"; .markdown-inner { - :first-child { + > :first-child { margin-top: 0; } - :last-child { + > :last-child { margin-bottom: 0; } } @@ -50,3 +50,9 @@ display: block; } } + +.book-columns > { + div + div { + margin-left: $padding-16 * 2; + } +} diff --git a/assets/_utils.scss b/assets/_utils.scss index 1474bec..62085d1 100644 --- a/assets/_utils.scss +++ b/assets/_utils.scss @@ -34,14 +34,6 @@ margin: 0 auto; } -.mr-auto { - margin-right: auto; -} - -.hide { - display: none; -} - @mixin fixed { position: fixed; top: 0; diff --git a/assets/book.scss b/assets/book.scss index 0a3ff4b..1e8ea26 100644 --- a/assets/book.scss +++ b/assets/book.scss @@ -149,21 +149,9 @@ ul.pagination { } } -.book-git-footer { - display: flex; - margin-top: $padding-16; - font-size: $font-size-14; - align-items: baseline; - - img { - width: $font-size-14; - vertical-align: bottom; - } -} - .book-footer { display: flex; - margin-top: $padding-16; + padding-top: $padding-16; font-size: $font-size-14; align-items: baseline; diff --git a/exampleSite/content/_index.md b/exampleSite/content/_index.md index a984a44..8da2a30 100644 --- a/exampleSite/content/_index.md +++ b/exampleSite/content/_index.md @@ -5,6 +5,23 @@ type: docs # Acerbo datus maxime +{{< columns >}} + +## Astris ipse furtiva + +Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut +olivae sensit **arma sorori** deducit, inesset **crudus**, ego vetuere aliis, +modo arsit? Utinam rapta fiducia valuere litora _adicit cursu_, ad facies + +<---> + +## Suis quot vota + +Ea _furtique_ risere fratres edidit terrae magis. Colla tam mihi tenebat: +miseram excita suadent es pecudes iam. Concilio _quam_ velatus posset ait quod +nunc! Fragosis suae dextra geruntur functus vulgata. +{{< /columns >}} + ## Tempora nisi nunc Lorem **markdownum** emicat gestu. Cannis sol pressit ducta. **Est** Idaei, @@ -26,8 +43,8 @@ sequens! ## Locis suis novi cum suoque decidit eadem -Idmoniae ripis, at aves, ali missa adest, ut *et autem*, et ab? Venit spes -versus finis sermonibus patefecit murum nec est sine oculis. *Ille* inmota +Idmoniae ripis, at aves, ali missa adest, ut _et autem_, et ab? Venit spes +versus finis sermonibus patefecit murum nec est sine oculis. _Ille_ inmota macies domoque caelestia cadit tantummodo scelus procul, corde! 1. Dolentem capi parte rostro alvum habentem pudor @@ -35,22 +52,9 @@ macies domoque caelestia cadit tantummodo scelus procul, corde! 3. E punior consurgit lentus 4. Vox hasta eras micantes -## Suis quot - -Ea *furtique* risere fratres edidit terrae magis. Colla tam mihi tenebat: -miseram excita suadent es pecudes iam. Concilio *quam* velatus posset ait quod -nunc! - -## Astris ipse furtiva vota collumque et habe - -Est in vagis et Pittheus tu arge accipiter regia iram vocatur nurus. Omnes ut -olivae sensit **arma sorori** deducit, inesset **crudus**, ego vetuere aliis, -modo arsit? Utinam rapta fiducia valuere litora *adicit cursu*, ad facies: -fragosis suae dextra geruntur functus vulgata. - ## Facibus pharetrae indetonsusque indulsit sic incurrite foliis -Nefandam et prisci palmas! Blandita cutis flectitur montis macies, te *nati* +Nefandam et prisci palmas! Blandita cutis flectitur montis macies, te _nati_ Latiis; turbaque inferias. Virginis tibi peracta avidusque facies caper nec, e at ademptae, mira. diff --git a/exampleSite/content/docs/shortcodes.md b/exampleSite/content/docs/shortcodes.md index ff46e16..9889fc6 100644 --- a/exampleSite/content/docs/shortcodes.md +++ b/exampleSite/content/docs/shortcodes.md @@ -80,30 +80,77 @@ Miseratus fonte Ditis conubia. # Multi-Column shortcode -```tpl -{{* column */>}} +```html +{{* columns */>}} # Left Content -... -{{* column /*/>}} +Lorem markdownum insigne... + +<---> + +# Mid Content +Lorem markdownum insigne... + +<---> + # Right Content -... -{{* /column */>}} +Lorem markdownum insigne... +{{* /columns */>}} ``` -{{< column >}} -# Left Content +{{< columns >}} +## Left Content Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes. Miseratus fonte Ditis conubia. -{{< column />}} -# Mid Content + +<---> + +## Mid Content Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat stringit, frustra Saturnius uteroque inter! -{{< column />}} -# Right Content + +<---> + +## Right Content Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes. Miseratus fonte Ditis conubia. -{{< /column >}} +{{< /columns >}} + + +# Mermaid Chart Shortcode + +{{< columns >}} +```tpl +{{* mermaid */>}} +sequenceDiagram + Alice->>Bob: Hello Bob, how are you? + alt is sick + Bob->>Alice: Not so good :( + else is well + Bob->>Alice: Feeling fresh like a daisy + end + opt Extra response + Bob->>Alice: Thanks for asking + end +{{* /mermaid */>}} +``` + +<---> + +{{< mermaid >}} +sequenceDiagram + Alice->>Bob: Hello Bob, how are you? + alt is sick + Bob->>Alice: Not so good :( + else is well + Bob->>Alice: Feeling fresh like a daisy + end + opt Extra response + Bob->>Alice: Thanks for asking + end +{{< /mermaid >}} + +{{< /columns >}} diff --git a/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.content b/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.content index b50549e..ce668b4 100644 --- a/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.content +++ b/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.content @@ -1 +1 @@ -/*!normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css*/html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}.markdown{line-height:1.7}.markdown h1,.markdown h2,.markdown h3,.markdown h4,.markdown h5{font-weight:400;line-height:1.25}.markdown h1>:first-child,.markdown h2>:first-child,.markdown h3>:first-child,.markdown h4>:first-child,.markdown h5>:first-child{margin-top:0;line-height:1em}.markdown b,.markdown optgroup,.markdown strong{font-weight:700}.markdown a{text-decoration:none}.markdown a:hover{text-decoration:underline}.markdown code{font-family:oxygen mono,monospace;padding:0 .25rem;background:#f8f9fa;border-radius:.15rem}.markdown pre{padding:1rem;background:#f8f9fa;border-radius:.15rem;font-size:.875rem;overflow-x:auto}.markdown pre code{padding:0;background:0 0}.markdown blockquote{border-left:2px solid #dee2e6;margin:0;padding:1px 1rem}.markdown blockquote :first-child{margin-top:0}.markdown blockquote :last-child{margin-bottom:0}.markdown table{border-spacing:0;border-collapse:collapse}.markdown table tr th,.markdown table tr td{padding:.5rem 1rem;line-height:1;border:1px solid #e9ecef}.markdown table tr:nth-child(2n){background:#f8f9fa}.markdown-inner :first-child{margin-top:0}.markdown-inner :last-child{margin-bottom:0}.book-expand{border:1px solid #e9ecef}.book-expand .book-expand-head{background:#f8f9fa;padding:.5rem 1rem;cursor:pointer}.book-expand .book-expand-content{display:none;padding:1rem}.book-expand input[type=checkbox]:checked+.book-expand-content{display:block}.book-tabs{border:1px solid #e9ecef}.book-tabs .book-tabs-head{border-bottom:1px solid #f8f9fa}.book-tabs .book-tabs-head label{display:inline-block;padding:.5rem 1rem;cursor:pointer}.book-tabs .book-tabs-content{padding:1rem;display:none}.book-tabs input[type=radio]:checked+.book-tabs-content{display:block}.flex{display:flex}.flex-auto{flex:1 1 auto}.flex-even{flex:1 1}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.align-center{align-items:center}.mx-auto{margin:0 auto}.mr-auto{margin-right:auto}.hide{display:none}html{font-size:16px;letter-spacing:.33px;scroll-behavior:smooth}html,body{min-width:20rem;overflow-x:hidden}body{color:#343a40;background:#fff;font-family:sans-serif;font-weight:400;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;box-sizing:border-box}body *{box-sizing:inherit}h1,h2,h3,h4,h5{font-weight:400}a{text-decoration:none;color:#004ed0}a:visited{color:#8440f1}img{vertical-align:middle}aside nav ul{padding:0;margin:0;list-style:none}aside nav ul li{margin:1em 0}aside nav ul a{display:block}aside nav ul a:hover{opacity:.5}aside nav ul ul{padding-left:1rem}ul.pagination{display:flex;justify-content:center}ul.pagination .page-item a{padding:1rem}.container{max-width:80rem;margin:0 auto}.book-brand{margin-top:0}.book-menu{flex:0 0 16rem;font-size:.875rem}.book-menu nav{width:16rem;padding:1rem;position:fixed;top:0;bottom:0;overflow-x:hidden;overflow-y:auto}.book-menu a{color:#343a40}.book-menu a.active{color:#004ed0}.book-section-flat{margin-bottom:2rem;margin-top:2rem}.book-section-flat>a,.book-section-flat>span{font-weight:600}.book-section-flat>ul{padding-left:0}.book-page{min-width:20rem;flex-grow:1;padding:1rem}.book-header{margin-bottom:1rem;display:none}.book-toc{flex:0 0 14rem;font-size:.75rem}.book-toc nav{width:14rem;padding:1rem;position:fixed;top:0;bottom:0;overflow-x:hidden;overflow-y:auto}.book-toc nav>ul>li:first-child{margin-top:0}.book-git-footer{display:flex;margin-top:1rem;font-size:.875rem;align-items:baseline}.book-git-footer img{width:.875rem;vertical-align:bottom}.book-footer{display:flex;margin-top:1rem;font-size:.875rem;align-items:baseline}.book-footer img{width:.875rem;vertical-align:bottom}.book-posts{min-width:20rem;max-width:41rem;flex-grow:1;padding:1rem}.book-posts article{padding-bottom:1rem}.book-home{padding:1rem}aside nav,.book-page,.book-posts,.markdown{transition:.2s ease-in-out;transition-property:transform,margin-left,opacity;will-change:transform,margin-left}@media screen and (max-width:55rem){.book-toc{display:none}}@media screen and (max-width:41rem){.book-menu{margin-left:-16rem}.book-header{display:flex}#menu-control:checked+main .book-menu nav,#menu-control:checked+main .book-page,#menu-control:checked+main .book-posts{transform:translateX(16rem)}#menu-control:checked+main .book-header label{transform:rotate(90deg)}#menu-control:checked+main .markdown{opacity:.25}}@media screen and (min-width:80rem){.book-page,.book-posts,.book-menu nav,.book-toc nav{padding:2rem 1rem}}@font-face{font-family:oxygen;font-style:normal;font-weight:300;font-display:swap;src:url(/fonts/oxygen-v8-latin-300.eot);src:local("Oxygen Light"),local(Oxygen-Light),url(/fonts/oxygen-v8-latin-300.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-300.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-300.woff) format("woff"),url(/fonts/oxygen-v8-latin-300.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-300.svg#Oxygen) format("svg")}@font-face{font-family:oxygen;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/oxygen-v8-latin-regular.eot);src:local("Oxygen Regular"),local(Oxygen-Regular),url(/fonts/oxygen-v8-latin-regular.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-regular.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-regular.woff) format("woff"),url(/fonts/oxygen-v8-latin-regular.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-regular.svg#Oxygen) format("svg")}@font-face{font-family:oxygen;font-style:normal;font-weight:700;font-display:swap;src:url(/fonts/oxygen-v8-latin-700.eot);src:local("Oxygen Bold"),local(Oxygen-Bold),url(/fonts/oxygen-v8-latin-700.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-700.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-700.woff) format("woff"),url(/fonts/oxygen-v8-latin-700.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-700.svg#Oxygen) format("svg")}@font-face{font-family:oxygen mono;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/oxygen-mono-v6-latin-regular.eot);src:local("Oxygen Mono"),local(OxygenMono-Regular),url(/fonts/oxygen-mono-v6-latin-regular.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-mono-v6-latin-regular.woff2) format("woff2"),url(/fonts/oxygen-mono-v6-latin-regular.woff) format("woff"),url(/fonts/oxygen-mono-v6-latin-regular.ttf) format("truetype"),url(/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono) format("svg")}body{font-family:oxygen,sans-serif} \ No newline at end of file +/*!normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css*/html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}.markdown{line-height:1.7}.markdown h1,.markdown h2,.markdown h3,.markdown h4,.markdown h5{font-weight:400;line-height:1.25}.markdown>:first-child{margin-top:0;line-height:1}.markdown b,.markdown optgroup,.markdown strong{font-weight:700}.markdown a{text-decoration:none}.markdown a:hover{text-decoration:underline}.markdown code{font-family:oxygen mono,monospace;padding:0 .25rem;background:#f8f9fa;border-radius:.15rem}.markdown pre{padding:1rem;background:#f8f9fa;border-radius:.15rem;font-size:.875rem;overflow-x:auto}.markdown pre code{padding:0;background:0 0}.markdown blockquote{border-left:2px solid #dee2e6;margin:0;padding:1px 1rem}.markdown blockquote :first-child{margin-top:0}.markdown blockquote :last-child{margin-bottom:0}.markdown table{border-spacing:0;border-collapse:collapse}.markdown table tr th,.markdown table tr td{padding:.5rem 1rem;line-height:1;border:1px solid #e9ecef}.markdown table tr:nth-child(2n){background:#f8f9fa}.markdown hr{height:1px;border:none;background:#e9ecef}.markdown-inner>:first-child{margin-top:0}.markdown-inner>:last-child{margin-bottom:0}.book-expand{border:1px solid #e9ecef}.book-expand .book-expand-head{background:#f8f9fa;padding:.5rem 1rem;cursor:pointer}.book-expand .book-expand-content{display:none;padding:1rem}.book-expand input[type=checkbox]:checked+.book-expand-content{display:block}.book-tabs{border:1px solid #e9ecef}.book-tabs .book-tabs-head{border-bottom:1px solid #f8f9fa}.book-tabs .book-tabs-head label{display:inline-block;padding:.5rem 1rem;cursor:pointer}.book-tabs .book-tabs-content{padding:1rem;display:none}.book-tabs input[type=radio]:checked+.book-tabs-content{display:block}.book-columns>div+div{margin-left:2rem}.flex{display:flex}.flex-auto{flex:1 1 auto}.flex-even{flex:1 1}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.align-center{align-items:center}.mx-auto{margin:0 auto}html{font-size:16px;letter-spacing:.33px;scroll-behavior:smooth}html,body{min-width:20rem;overflow-x:hidden}body{color:#343a40;background:#fff;font-family:sans-serif;font-weight:400;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;box-sizing:border-box}body *{box-sizing:inherit}h1,h2,h3,h4,h5{font-weight:400}a{text-decoration:none;color:#004ed0}a:visited{color:#8440f1}img{vertical-align:middle}aside nav ul{padding:0;margin:0;list-style:none}aside nav ul li{margin:1em 0}aside nav ul a{display:block}aside nav ul a:hover{opacity:.5}aside nav ul ul{padding-left:1rem}ul.pagination{display:flex;justify-content:center}ul.pagination .page-item a{padding:1rem}.container{max-width:80rem;margin:0 auto}.book-brand{margin-top:0}.book-menu{flex:0 0 16rem;font-size:.875rem}.book-menu nav{width:16rem;padding:1rem;position:fixed;top:0;bottom:0;overflow-x:hidden;overflow-y:auto}.book-menu a{color:#343a40}.book-menu a.active{color:#004ed0}.book-section-flat{margin-bottom:2rem;margin-top:2rem}.book-section-flat>a,.book-section-flat>span{font-weight:600}.book-section-flat>ul{padding-left:0}.book-page{min-width:20rem;flex-grow:1;padding:1rem}.book-header{margin-bottom:1rem;display:none}.book-toc{flex:0 0 14rem;font-size:.75rem}.book-toc nav{width:14rem;padding:1rem;position:fixed;top:0;bottom:0;overflow-x:hidden;overflow-y:auto}.book-toc nav>ul>li:first-child{margin-top:0}.book-footer{display:flex;padding-top:1rem;font-size:.875rem;align-items:baseline}.book-footer img{width:.875rem;vertical-align:bottom}.book-posts{min-width:20rem;max-width:41rem;flex-grow:1;padding:1rem}.book-posts article{padding-bottom:1rem}.book-home{padding:1rem}aside nav,.book-page,.book-posts,.markdown{transition:.2s ease-in-out;transition-property:transform,margin-left,opacity;will-change:transform,margin-left}@media screen and (max-width:55rem){.book-toc{display:none}}@media screen and (max-width:41rem){.book-menu{margin-left:-16rem}.book-header{display:flex}#menu-control:checked+main .book-menu nav,#menu-control:checked+main .book-page,#menu-control:checked+main .book-posts{transform:translateX(16rem)}#menu-control:checked+main .book-header label{transform:rotate(90deg)}#menu-control:checked+main .markdown{opacity:.25}}@media screen and (min-width:80rem){.book-page,.book-posts,.book-menu nav,.book-toc nav{padding:2rem 1rem}}@font-face{font-family:oxygen;font-style:normal;font-weight:300;font-display:swap;src:url(/fonts/oxygen-v8-latin-300.eot);src:local("Oxygen Light"),local(Oxygen-Light),url(/fonts/oxygen-v8-latin-300.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-300.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-300.woff) format("woff"),url(/fonts/oxygen-v8-latin-300.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-300.svg#Oxygen) format("svg")}@font-face{font-family:oxygen;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/oxygen-v8-latin-regular.eot);src:local("Oxygen Regular"),local(Oxygen-Regular),url(/fonts/oxygen-v8-latin-regular.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-regular.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-regular.woff) format("woff"),url(/fonts/oxygen-v8-latin-regular.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-regular.svg#Oxygen) format("svg")}@font-face{font-family:oxygen;font-style:normal;font-weight:700;font-display:swap;src:url(/fonts/oxygen-v8-latin-700.eot);src:local("Oxygen Bold"),local(Oxygen-Bold),url(/fonts/oxygen-v8-latin-700.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-v8-latin-700.woff2) format("woff2"),url(/fonts/oxygen-v8-latin-700.woff) format("woff"),url(/fonts/oxygen-v8-latin-700.ttf) format("truetype"),url(/fonts/oxygen-v8-latin-700.svg#Oxygen) format("svg")}@font-face{font-family:oxygen mono;font-style:normal;font-weight:400;font-display:swap;src:url(/fonts/oxygen-mono-v6-latin-regular.eot);src:local("Oxygen Mono"),local(OxygenMono-Regular),url(/fonts/oxygen-mono-v6-latin-regular.eot?#iefix) format("embedded-opentype"),url(/fonts/oxygen-mono-v6-latin-regular.woff2) format("woff2"),url(/fonts/oxygen-mono-v6-latin-regular.woff) format("woff"),url(/fonts/oxygen-mono-v6-latin-regular.ttf) format("truetype"),url(/fonts/oxygen-mono-v6-latin-regular.svg#OxygenMono) format("svg")}body{font-family:oxygen,sans-serif} \ No newline at end of file diff --git a/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.json b/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.json index 212e08d..9919e5e 100644 --- a/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.json +++ b/exampleSite/resources/_gen/assets/scss/book.scss_48b060fe05b0a273d182ef83c0605941.json @@ -1 +1 @@ -{"Target":"book.min.c104bb061e603114d8caae951ee4fd5f4c3c731846b3f5b64e26b55524416940.css","MediaType":"text/css","Data":{"Integrity":"sha256-wQS7Bh5gMRTYyq6VHuT9X0w8cxhGs/W2Tia1VSRBaUA="}} \ No newline at end of file +{"Target":"book.min.2640646abff8284daffab17a8c1639ff1b0093a41830c30e7e8f654e2324dd9f.css","MediaType":"text/css","Data":{"Integrity":"sha256-JkBkar/4KE2v+rF6jBY5/xsAk6QYMMMOfo9lTiMk3Z8="}} \ No newline at end of file diff --git a/layouts/partials/docs/git-footer.html b/layouts/partials/docs/git-footer.html index 1f54daa..c61d759 100644 --- a/layouts/partials/docs/git-footer.html +++ b/layouts/partials/docs/git-footer.html @@ -1,5 +1,5 @@ {{ if or .GitInfo .Site.Params.BookEditPath }} -
+ {{ .Inner }} +
diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html index 24520e7..ce78cb8 100644 --- a/layouts/shortcodes/tab.html +++ b/layouts/shortcodes/tab.html @@ -8,5 +8,5 @@ {{ .Parent.Scratch.Add $group (dict "Name" $name "Content" .Inner) }} {{ else }} - {{- errorf "%q: tab shortcode must be inside tabs shortcode" .Page.Path -}} + {{ errorf "%q: 'tab' shortcode must be inside 'tabs' shortcode" .Page.Path }} {{ end}} diff --git a/static/mermaid.min.js b/static/mermaid.min.js new file mode 100644 index 0000000..c8eee17 --- /dev/null +++ b/static/mermaid.min.js @@ -0,0 +1,19 @@ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.mermaid=e():t.mermaid=e()}(window,function(){return function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=177)}([function(t,e,n){(function(t){t.exports=function(){"use strict";var e,r;function i(){return e.apply(null,arguments)}function a(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function u(t){return void 0===t}function s(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function c(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function l(t,e){var n,r=[];for(n=0;n=0;)(r=i[a])&&(o&&o!==r.nextSibling&&o.parentNode.insertBefore(r,o),o=r);return this},sort:function(t){function e(e,n){return e&&n?t(e.__data__,n.__data__):!e-!n}t||(t=Et);for(var n=this._groups,r=n.length,i=new Array(r),a=0;a=0&&dt||t>i||r>e||e>a))return this;var o,u,s=i-n,c=this._root;switch(u=(e<(r+a)/2)<<1|t<(n+i)/2){case 0:do{(o=new Array(4))[u]=c,c=o}while(a=r+(s*=2),t>(i=n+s)||e>a);break;case 1:do{(o=new Array(4))[u]=c,c=o}while(a=r+(s*=2),(n=i-s)>t||e>a);break;case 2:do{(o=new Array(4))[u]=c,c=o}while(r=a-(s*=2),t>(i=n+s)||r>e);break;case 3:do{(o=new Array(4))[u]=c,c=o}while(r=a-(s*=2),(n=i-s)>t||r>e)}this._root&&this._root.length&&(this._root=c)}return this._x0=n,this._y0=r,this._x1=i,this._y1=a,this},yu.data=function(){var t=[];return this.visit(function(e){if(!e.length)do{t.push(e.data)}while(e=e.next)}),t},yu.extent=function(t){return arguments.length?this.cover(+t[0][0],+t[0][1]).cover(+t[1][0],+t[1][1]):isNaN(this._x0)?void 0:[[this._x0,this._y0],[this._x1,this._y1]]},yu.find=function(t,e,n){var r,i,a,o,u,s,c,l=this._x0,f=this._y0,d=this._x1,h=this._y1,_=[],p=this._root;for(p&&_.push(new fu(p,l,f,d,h)),null==n?n=1/0:(l=t-n,f=e-n,d=t+n,h=e+n,n*=n);s=_.pop();)if(!(!(p=s.node)||(i=s.x0)>d||(a=s.y0)>h||(o=s.x1)tc&&(tc=a):c^(u*ec<(s=(s+360)%360-180)&&stc&&(tc=e)),c?td&&(d=u),m=l*l*p,(h=Math.max(d/m,m/f))>_){l-=u;break}_=h}y.push(o={value:l,dice:s2&&D.push("'"+this.terminals_[k]+"'");A=h.showPosition?"Parse error on line "+(s+1)+":\n"+h.showPosition()+"\nExpecting "+D.join(", ")+", got '"+(this.terminals_[g]||g)+"'":"Parse error on line "+(s+1)+": Unexpected "+(g==f?"end of input":"'"+(this.terminals_[g]||g)+"'"),this.parseError(A,{text:h.match,token:this.terminals_[g]||g,line:h.yylineno,loc:m,expected:D})}if(M[0]instanceof Array&&M.length>1)throw new Error("Parse Error: multiple actions possible at state: "+b+", token: "+g);switch(M[0]){case 1:n.push(g),i.push(h.yytext),a.push(h.yylloc),n.push(M[1]),g=null,v?(g=v,v=null):(c=h.yyleng,u=h.yytext,s=h.yylineno,m=h.yylloc,l>0&&l--);break;case 2:if(L=this.productions_[M[1]][1],Y.$=i[i.length-L],Y._$={first_line:a[a.length-(L||1)].first_line,last_line:a[a.length-1].last_line,first_column:a[a.length-(L||1)].first_column,last_column:a[a.length-1].last_column},y&&(Y._$.range=[a[a.length-(L||1)].range[0],a[a.length-1].range[1]]),void 0!==(w=this.performAction.apply(Y,[u,c,s,_.yy,M[1],i,a].concat(d))))return w;L&&(n=n.slice(0,-1*L*2),i=i.slice(0,-1*L),a=a.slice(0,-1*L)),n.push(this.productions_[M[1]][0]),i.push(Y.$),a.push(Y._$),x=o[n[n.length-2]][n[n.length-1]],n.push(x);break;case 3:return!0}}return!0}},L={EOF:1,parseError:function(t,e){if(!this.yy.parser)throw new Error(t);this.yy.parser.parseError(t,e)},setInput:function(t,e){return this.yy=e||this.yy||{},this._input=t,this._more=this._backtrack=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var t=this._input[0];return this.yytext+=t,this.yyleng++,this.offset++,this.match+=t,this.matched+=t,t.match(/(?:\r\n?|\n).*/g)?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),t},unput:function(t){var e=t.length,n=t.split(/(?:\r\n?|\n)/g);this._input=t+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-e),this.offset-=e;var r=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),n.length-1&&(this.yylineno-=n.length-1);var i=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:n?(n.length===r.length?this.yylloc.first_column:0)+r[r.length-n.length].length-n[0].length:this.yylloc.first_column-e},this.options.ranges&&(this.yylloc.range=[i[0],i[0]+this.yyleng-e]),this.yyleng=this.yytext.length,this},more:function(){return this._more=!0,this},reject:function(){return this.options.backtrack_lexer?(this._backtrack=!0,this):this.parseError("Lexical error on line "+(this.yylineno+1)+". You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},less:function(t){this.unput(this.match.slice(t))},pastInput:function(){var t=this.matched.substr(0,this.matched.length-this.match.length);return(t.length>20?"...":"")+t.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var t=this.match;return t.length<20&&(t+=this._input.substr(0,20-t.length)),(t.substr(0,20)+(t.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var t=this.pastInput(),e=new Array(t.length+1).join("-");return t+this.upcomingInput()+"\n"+e+"^"},test_match:function(t,e){var n,r,i;if(this.options.backtrack_lexer&&(i={yylineno:this.yylineno,yylloc:{first_line:this.yylloc.first_line,last_line:this.last_line,first_column:this.yylloc.first_column,last_column:this.yylloc.last_column},yytext:this.yytext,match:this.match,matches:this.matches,matched:this.matched,yyleng:this.yyleng,offset:this.offset,_more:this._more,_input:this._input,yy:this.yy,conditionStack:this.conditionStack.slice(0),done:this.done},this.options.ranges&&(i.yylloc.range=this.yylloc.range.slice(0))),(r=t[0].match(/(?:\r\n?|\n).*/g))&&(this.yylineno+=r.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:r?r[r.length-1].length-r[r.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+t[0].length},this.yytext+=t[0],this.match+=t[0],this.matches=t,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._backtrack=!1,this._input=this._input.slice(t[0].length),this.matched+=t[0],n=this.performAction.call(this,this.yy,this,e,this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),n)return n;if(this._backtrack){for(var a in i)this[a]=i[a];return!1}return!1},next:function(){if(this.done)return this.EOF;var t,e,n,r;this._input||(this.done=!0),this._more||(this.yytext="",this.match="");for(var i=this._currentRules(),a=0;a-1},vr.prototype.set=function(t,e){var n=this.__data__,r=Ar(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this},br.prototype.clear=function(){this.size=0,this.__data__={hash:new gr,map:new(Xn||vr),string:new gr}},br.prototype.delete=function(t){var e=Pa(this,t).delete(t);return this.size-=e?1:0,e},br.prototype.get=function(t){return Pa(this,t).get(t)},br.prototype.has=function(t){return Pa(this,t).has(t)},br.prototype.set=function(t,e){var n=Pa(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this},Mr.prototype.add=Mr.prototype.push=function(t){return this.__data__.set(t,u),this},Mr.prototype.has=function(t){return this.__data__.has(t)},wr.prototype.clear=function(){this.__data__=new vr,this.size=0},wr.prototype.delete=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n},wr.prototype.get=function(t){return this.__data__.get(t)},wr.prototype.has=function(t){return this.__data__.has(t)},wr.prototype.set=function(t,e){var n=this.__data__;if(n instanceof vr){var r=n.__data__;if(!Xn||r.length-1&&t%1==0&&t0}Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t,e,n,i){var a=e.y-t.y,o=t.x-e.x,u=e.x*t.y-t.x*e.y,s=a*n.x+o*n.y+u,c=a*i.x+o*i.y+u;if(0===s||0===c||!r(s,c)){var l=i.y-n.y,f=n.x-i.x,d=i.x*n.y-n.x*i.y,h=l*t.x+f*t.y+d,_=l*e.x+f*e.y+d;if(0===h||0===_||!r(h,_)){var p=a*f-l*o;if(0!==p){var m=Math.abs(p/2),y=o*d-f*u;return{x:y<0?(y-m)/p:(y+m)/p,y:(y=l*u-a*d)<0?(y-m)/p:(y+m)/p}}}}}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=s(n(8)),i=s(n(7)),a=s(n(4)),o=s(n(6)),u=s(n(5));function s(t){return t&&t.__esModule?t:{default:t}}e.default={node:r.default,circle:i.default,ellipse:a.default,polygon:o.default,rect:u.default}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o(n(24)),i=o(n(22)),a=o(n(0));function o(t){return t&&t.__esModule?t:{default:t}}e.default={intersect:r.default,render:i.default,util:a.default}}])},function(t,e){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(t){"object"==typeof window&&(n=window)}t.exports=n},function(t,e){},function(t,e,n){(function(t){function n(t,e){for(var n=0,r=t.length-1;r>=0;r--){var i=t[r];"."===i?t.splice(r,1):".."===i?(t.splice(r,1),n++):n&&(t.splice(r,1),n--)}if(e)for(;n--;n)t.unshift("..");return t}var r=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/,i=function(t){return r.exec(t).slice(1)};function a(t,e){if(t.filter)return t.filter(e);for(var n=[],r=0;ru||s>e[c].lim));for(i=c,c=r;(c=t.parent(c))!==i;)o.push(c);return{path:a.concat(o.reverse()),lca:i}}(t,e,i.v,i.w),o=a.path,u=a.lca,s=0,c=o[s],l=!0;n!==i.w;){if(r=t.node(n),l){for(;(c=o[s])!==u&&t.node(c).maxRank-1},br.prototype.set=function(t,e){var n=this.__data__,r=Er(n,t);return r<0?(++this.size,n.push([t,e])):n[r][1]=e,this},Mr.prototype.clear=function(){this.size=0,this.__data__={hash:new vr,map:new(Qn||br),string:new vr}},Mr.prototype.delete=function(t){var e=Fa(this,t).delete(t);return this.size-=e?1:0,e},Mr.prototype.get=function(t){return Fa(this,t).get(t)},Mr.prototype.has=function(t){return Fa(this,t).has(t)},Mr.prototype.set=function(t,e){var n=Fa(this,t),r=n.size;return n.set(t,e),this.size+=n.size==r?0:1,this},wr.prototype.add=wr.prototype.push=function(t){return this.__data__.set(t,u),this},wr.prototype.has=function(t){return this.__data__.has(t)},kr.prototype.clear=function(){this.__data__=new br,this.size=0},kr.prototype.delete=function(t){var e=this.__data__,n=e.delete(t);return this.size=e.size,n},kr.prototype.get=function(t){return this.__data__.get(t)},kr.prototype.has=function(t){return this.__data__.has(t)},kr.prototype.set=function(t,e){var n=this.__data__;if(n instanceof br){var r=n.__data__;if(!Qn||r.length