This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 98bf279086eccafe43afae8e897c9dc7786ab102 Author: Zoran Regvart <zregv...@apache.org> AuthorDate: Thu Feb 11 15:52:01 2021 +0100 chore: publish Kamlet catalog This adds style changes needed to publish the Kamlet catalog and adds a new source reference to the camel-kamlets repository. --- antora-playbook.yml | 3 ++ antora-ui-camel/src/css/catalog.css | 51 +++++++++++++++++------- antora-ui-camel/src/css/doc.css | 4 ++ antora-ui-camel/src/css/img.css | 8 ---- antora-ui-camel/src/css/nav.css | 5 +++ antora-ui-camel/src/css/site.css | 1 - antora-ui-camel/src/layouts/catalog.hbs | 11 ----- antora-ui-camel/src/partials/catalog-article.hbs | 12 ------ antora-ui-camel/src/partials/catalog-body.hbs | 4 -- antora-ui-camel/src/partials/catalog-main.hbs | 11 ----- antora-ui-camel/src/partials/catalog.hbs | 20 ---------- 11 files changed, 49 insertions(+), 81 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 132875b..333c59b 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -49,6 +49,9 @@ content: - url: g...@github.com:apache/camel-k-runtime.git branches: master start_path: docs + - url: g...@github.com:nicolaferraro/camel-kamelets.git + branches: ui + start_path: docs - url: g...@github.com:apache/camel-quarkus.git branches: - master diff --git a/antora-ui-camel/src/css/catalog.css b/antora-ui-camel/src/css/catalog.css index c311906..0c1acd6 100644 --- a/antora-ui-camel/src/css/catalog.css +++ b/antora-ui-camel/src/css/catalog.css @@ -1,24 +1,47 @@ -.catalog .container { - margin-top: 1.2rem; - display: flex; - flex-wrap: wrap; +.catalog.paragraph { + margin: 0; } -.catalog .entry { - width: 15rem; - min-height: 9rem; +.catalog { + width: 32%; + height: 9rem; + display: inline-block; + vertical-align: top; + padding: 1rem 0.8rem 0 0; /* there is a whitespace following every p.catalog that takes up space on the right, having 1rem instead of 0.8rem for right pad would look asymmetrical */ +} + +@media screen and (max-width: 1024px) { + .catalog { + width: 49%; + } +} + +@media screen and (max-width: 626px) { + .catalog { + width: 100%; + } +} + +.catalog p { + border: 1px solid var(--color-smoke-90); + height: 100%; +} + +.catalog .item { + display: block; padding: 1rem; - margin: 0.5rem; - border: 2px solid var(--color-smoke-90); - text-align: center; } -.catalog .entry .image { +.catalog .item a { + background-image: none; display: block; text-align: center; } -.catalog .entry .image > img { - height: 3rem; - margin: 1rem; +.catalog .item .image { + display: block; +} + +.catalog .item .image img { + width: 4rem; } diff --git a/antora-ui-camel/src/css/doc.css b/antora-ui-camel/src/css/doc.css index 2928620..0559128 100644 --- a/antora-ui-camel/src/css/doc.css +++ b/antora-ui-camel/src/css/doc.css @@ -36,6 +36,10 @@ margin: 1.5rem 0; } +.doc > h1.page:first-child img { + width: 1rem; +} + #preamble + .sect1, .doc .sect1 + .sect1 { margin-top: 2rem; diff --git a/antora-ui-camel/src/css/img.css b/antora-ui-camel/src/css/img.css deleted file mode 100644 index 3f76c84..0000000 --- a/antora-ui-camel/src/css/img.css +++ /dev/null @@ -1,8 +0,0 @@ -article h1.page img { - width: 1em; -} - -.nav-link .image > img, -.breadcrumbs li .image > img { - width: 1em; -} diff --git a/antora-ui-camel/src/css/nav.css b/antora-ui-camel/src/css/nav.css index 6a19b32..40fb557 100644 --- a/antora-ui-camel/src/css/nav.css +++ b/antora-ui-camel/src/css/nav.css @@ -219,6 +219,11 @@ html.is-clipped--nav { font-weight: var(--body-font-weight-bold); } +.nav-link .image > img, +.breadcrumbs li .image > img { + width: 1em; +} + .nav-panel-explore { background: var(--nav-background); display: flex; diff --git a/antora-ui-camel/src/css/site.css b/antora-ui-camel/src/css/site.css index c1f625b..184a68b 100644 --- a/antora-ui-camel/src/css/site.css +++ b/antora-ui-camel/src/css/site.css @@ -26,5 +26,4 @@ @import 'sitemap.css'; @import 'videos.css'; @import 'download.css'; -@import 'img.css'; @import 'catalog.css'; diff --git a/antora-ui-camel/src/layouts/catalog.hbs b/antora-ui-camel/src/layouts/catalog.hbs deleted file mode 100644 index 6a94f57..0000000 --- a/antora-ui-camel/src/layouts/catalog.hbs +++ /dev/null @@ -1,11 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> -{{> head defaultPageTitle='Untitled'}} - </head> - <body class="article{{#with (or page.attributes.role page.role)}} {{{this}}}{{/with}}"> -{{> header}} -{{> catalog-body}} -{{> footer}} - </body> -</html> diff --git a/antora-ui-camel/src/partials/catalog-article.hbs b/antora-ui-camel/src/partials/catalog-article.hbs deleted file mode 100644 index e8317a6..0000000 --- a/antora-ui-camel/src/partials/catalog-article.hbs +++ /dev/null @@ -1,12 +0,0 @@ -<article class="doc catalog"> -{{#with page.title}} -<h1 class="page">{{{this}}}</h1> -{{/with}} -{{{page.contents}}} -<div class="container"> -{{#with page.navigation}} -{{> catalog navigation=this}} -{{/with}} -</div> -{{> pagination}} -</article> diff --git a/antora-ui-camel/src/partials/catalog-body.hbs b/antora-ui-camel/src/partials/catalog-body.hbs deleted file mode 100644 index d11c0ec..0000000 --- a/antora-ui-camel/src/partials/catalog-body.hbs +++ /dev/null @@ -1,4 +0,0 @@ -<div class="body"> -{{> nav}} -{{> catalog-main}} -</div> diff --git a/antora-ui-camel/src/partials/catalog-main.hbs b/antora-ui-camel/src/partials/catalog-main.hbs deleted file mode 100644 index a1769e6..0000000 --- a/antora-ui-camel/src/partials/catalog-main.hbs +++ /dev/null @@ -1,11 +0,0 @@ -<main class="article"> -{{> toolbar}} - <div class="content"> -{{#if (eq page.layout '404')}} -{{> article-404}} -{{else}} -{{> toc}} -{{> catalog-article}} -{{/if}} - </div> -</main> diff --git a/antora-ui-camel/src/partials/catalog.hbs b/antora-ui-camel/src/partials/catalog.hbs deleted file mode 100644 index 4cb5c95..0000000 --- a/antora-ui-camel/src/partials/catalog.hbs +++ /dev/null @@ -1,20 +0,0 @@ -{{#if navigation.length}} - {{#each navigation}} - {{#if ../show}}{{#if ./content}} - <div class="entry"> - <a href="{{~#if (eq ./urlType 'internal')}}{{{relativize ./url}}}{{~else}}{{{./url}}}{{~/if}}"> - {{{./content}}} - </a> - </div> - {{/if}}{{/if}} - {{#if (eq ./url @root.page.url)}} - {{> catalog navigation=./items show='true'}} - {{else}} - {{#if ../show}} - {{> catalog navigation=./items show='true'}} - {{else}} - {{> catalog navigation=./items}} - {{/if}} - {{/if}} - {{/each}} -{{/if}}