diff --git a/component-library/components/about/about.bookshop.yml b/component-library/components/about/about.bookshop.yml index d9cdca58..de1246c2 100644 --- a/component-library/components/about/about.bookshop.yml +++ b/component-library/components/about/about.bookshop.yml @@ -30,6 +30,7 @@ blueprint: mode: order: width: + justify: link-type: links: - diff --git a/component-library/components/about/about.hugo.html b/component-library/components/about/about.hugo.html index 8562c7c1..5296ad2e 100644 --- a/component-library/components/about/about.hugo.html +++ b/component-library/components/about/about.hugo.html @@ -26,7 +26,7 @@ "link-type" $args.linkType "links" $args.links "orientation" "horizontal" - "width" (or .width 8) + "width" (or $args.width 8) ) }} {{- end -}} diff --git a/component-library/components/articles/articles.bookshop.yml b/component-library/components/articles/articles.bookshop.yml index 8cd6b507..3a23d737 100644 --- a/component-library/components/articles/articles.bookshop.yml +++ b/component-library/components/articles/articles.bookshop.yml @@ -42,4 +42,6 @@ blueprint: header-style: footer-style: orientation: - class: \ No newline at end of file + class: + width: + justify: diff --git a/component-library/components/articles/articles.hugo.html b/component-library/components/articles/articles.hugo.html index 990c0de7..75e0a761 100644 --- a/component-library/components/articles/articles.hugo.html +++ b/component-library/components/articles/articles.hugo.html @@ -62,48 +62,46 @@ {{ if not $error }} -
- {{- partial "assets/section-title.html" (dict "heading" $args.heading "class" "py-5") -}} + {{- partial "assets/section-title.html" (dict "heading" $args.heading "class" "py-5") -}} - {{ $partial := "assets/card-group.html" }} - {{ $params := dict }} - {{- $params = merge $params (dict - "page" page - "list" $pages - "max" $args.max - "cols" $args.cols - "icon-rounded" $args.iconRounded - "href" (cond $moreButton $moreLink "") - "href-title" (cond $moreButton $moreTitle "") - "href-force" (gt $result.total (len $result.pages)) - )}} + {{ $partial := "assets/card-group.html" }} + {{ $params := dict }} + {{- $params = merge $params (dict + "page" page + "list" $pages + "max" $args.max + "cols" $args.cols + "icon-rounded" $args.iconRounded + "href" (cond $moreButton $moreLink "") + "href-title" (cond $moreButton $moreTitle "") + "href-force" (gt $result.total (len $result.pages)) + )}} - {{ if $args.scroll }} - {{ $partial := "assets/stack.html" }} - {{ $params = merge $params (dict - "header-style" "none" - "body-style" "title" - "footer-style" "none" - "gutter" 1 - "padding" 3 - "ratio" "1x1" - "orientation" "horizontal-sm" - "styles" (cond $args.bento $styles "") - ) -}} - {{ else }} - {{ $params = merge $params (dict - "header-style" $args.headerStyle - "footer-style" $args.footerStyle - "padding" $args.padding - "class" (or $args.class "border-0") - "icon-style" "fa-2x" - "align" "start" - "orientation" $args.orientation - "hook" "assets/live-card.html" - "pagination" $args.pagination - "paginate" $paginate - ) -}} - {{ end }} - {{ partial $partial $params }} -
+ {{ if $args.scroll }} + {{ $partial := "assets/stack.html" }} + {{ $params = merge $params (dict + "header-style" "none" + "body-style" "title" + "footer-style" "none" + "gutter" 1 + "padding" 3 + "ratio" "1x1" + "orientation" "horizontal-sm" + "styles" (cond $args.bento $styles "") + ) -}} + {{ else }} + {{ $params = merge $params (dict + "header-style" $args.headerStyle + "footer-style" $args.footerStyle + "padding" $args.padding + "class" (or $args.class "border-0") + "icon-style" "fa-2x" + "align" "start" + "orientation" $args.orientation + "hook" "assets/live-card.html" + "pagination" $args.pagination + "paginate" $paginate + ) -}} + {{ end }} + {{ partial $partial $params }} {{ end }} \ No newline at end of file diff --git a/component-library/components/cards/cards.bookshop.yml b/component-library/components/cards/cards.bookshop.yml index 641d90cc..6c7e1061 100644 --- a/component-library/components/cards/cards.bookshop.yml +++ b/component-library/components/cards/cards.bookshop.yml @@ -29,4 +29,6 @@ blueprint: mode: content: orientation: - class: \ No newline at end of file + class: + width: + justify: diff --git a/component-library/components/cards/cards.hugo.html b/component-library/components/cards/cards.hugo.html index 64bf62d1..e155337a 100644 --- a/component-library/components/cards/cards.hugo.html +++ b/component-library/components/cards/cards.hugo.html @@ -32,40 +32,38 @@ {{ end}} {{ if not $error }} -
- {{- partial "assets/section-title.html" (dict "heading" $args.heading "class" "py-5") -}} + {{- partial "assets/section-title.html" (dict "heading" $args.heading "class" "py-5") -}} - {{- partial "assets/card-group.html" (dict - "page" page - "list" $list - "class" (printf "border-0 card-icon-primary d-sm-none %s" $args.class) - "cols" $args.cols - "gutter" "4" - "padding" $args.padding - "header-style" "none" - "footer-style" "none" - "icon-rounded" $args.iconRounded - "icon-style" "fa-2x" - "align" "start" - "orientation" ($args.orientation | default "horizontal-sm") - "hook" "assets/live-card.html" - ) -}} + {{- partial "assets/card-group.html" (dict + "page" page + "list" $list + "class" (printf "border-0 card-icon-primary d-sm-none %s" $args.class) + "cols" $args.cols + "gutter" "4" + "padding" $args.padding + "header-style" "none" + "footer-style" "none" + "icon-rounded" $args.iconRounded + "icon-style" "fa-2x" + "align" "start" + "orientation" ($args.orientation | default "horizontal-sm") + "hook" "assets/live-card.html" + ) -}} - {{- partial "assets/card-group.html" (dict - "page" page - "list" $list - "class" (printf "border-0 card-icon-primary d-none d-sm-block %s" $args.class) - "cols" $args.cols - "gutter" "4" - "padding" $args.padding - "header-style" "none" - "footer-style" "none" - "icon-rounded" $args.iconRounded - "icon-style" "fa-2x" - "align" "start" - "orientation" ($args.orientation | default "stacked") - "hook" "assets/live-card.html" - ) -}} -
+ {{- partial "assets/card-group.html" (dict + "page" page + "list" $list + "class" (printf "border-0 card-icon-primary d-none d-sm-block %s" $args.class) + "cols" $args.cols + "gutter" "4" + "padding" $args.padding + "header-style" "none" + "footer-style" "none" + "icon-rounded" $args.iconRounded + "icon-style" "fa-2x" + "align" "start" + "orientation" ($args.orientation | default "stacked") + "hook" "assets/live-card.html" + ) -}} {{ end }} diff --git a/component-library/components/faq/faq.bookshop.yml b/component-library/components/faq/faq.bookshop.yml index 6928fee7..119f4a5e 100644 --- a/component-library/components/faq/faq.bookshop.yml +++ b/component-library/components/faq/faq.bookshop.yml @@ -17,6 +17,8 @@ blueprint: width: size: contrast: + width: + justify: background: backdrop: color: diff --git a/component-library/components/faq/faq.hugo.html b/component-library/components/faq/faq.hugo.html index e23f1680..9fcfb210 100644 --- a/component-library/components/faq/faq.hugo.html +++ b/component-library/components/faq/faq.hugo.html @@ -17,43 +17,41 @@ {{ end }} {{ if not $args.err }} -
- {{ $color := "" }} - {{ if $args.contrast }}{{ $color = "white" }}{{ end }} - {{- partial "assets/section-title.html" (dict - "heading" $args.heading - "color" $color - "class" "py-5" - ) -}} + {{ $color := "" }} + {{ if $args.contrast }}{{ $color = "white" }}{{ end }} + {{- partial "assets/section-title.html" (dict + "heading" $args.heading + "color" $color + "class" "py-5" + ) -}} - {{ $class := "" }} - {{ $id := printf "faq-%s" (md5 (delimit (slice . now) "-")) }} + {{ $class := "" }} + {{ $id := printf "faq-%s" (md5 (delimit (slice . now) "-")) }} -
- {{ range $index, $item := $args.items }} -
- {{- with $item.title -}} -
- -
- {{- end -}} -
-
{{ $item.description | page.RenderString | safeHTML }}
+
+ {{ range $index, $item := $args.items }} +
+ {{- with $item.title -}} +
+
+ {{- end -}} +
+
{{ $item.description | page.RenderString | safeHTML }}
- {{ end }} -
+
+ {{ end }}
{{ end }} \ No newline at end of file diff --git a/component-library/components/hero/hero.bookshop.yml b/component-library/components/hero/hero.bookshop.yml index 86337c5e..b24f3fa9 100644 --- a/component-library/components/hero/hero.bookshop.yml +++ b/component-library/components/hero/hero.bookshop.yml @@ -38,3 +38,4 @@ blueprint: cover: orientation: width: + justify: diff --git a/component-library/components/hero/hero.hugo.html b/component-library/components/hero/hero.hugo.html index 87b16822..4a9850d5 100644 --- a/component-library/components/hero/hero.hugo.html +++ b/component-library/components/hero/hero.hugo.html @@ -30,6 +30,7 @@ "links" $args.links "orientation" $args.orientation "width" $args.width + "justify" $args.justify ) }} {{ end }} \ No newline at end of file diff --git a/component-library/components/releases/releases.bookshop.yml b/component-library/components/releases/releases.bookshop.yml index 34782010..66b0dd9c 100644 --- a/component-library/components/releases/releases.bookshop.yml +++ b/component-library/components/releases/releases.bookshop.yml @@ -21,4 +21,6 @@ blueprint: backdrop: color: subtle: + width: + justify: data: \ No newline at end of file diff --git a/component-library/components/separator/separator.hugo.html b/component-library/components/separator/separator.hugo.html index 4047a6cb..beeb1ca9 100644 --- a/component-library/components/separator/separator.hugo.html +++ b/component-library/components/separator/separator.hugo.html @@ -16,5 +16,5 @@ {{ end }} {{ if not $args.err }} -
+
{{ end }} \ No newline at end of file diff --git a/component-library/components/video-message/video-message.bookshop.yml b/component-library/components/video-message/video-message.bookshop.yml index 5a860ebd..b71ae44e 100644 --- a/component-library/components/video-message/video-message.bookshop.yml +++ b/component-library/components/video-message/video-message.bookshop.yml @@ -39,6 +39,7 @@ blueprint: label: border: width: + justify: _structures: messages: diff --git a/component-library/components/video-message/video-message.hugo.html b/component-library/components/video-message/video-message.hugo.html index 3aeb73ab..2157487e 100644 --- a/component-library/components/video-message/video-message.hugo.html +++ b/component-library/components/video-message/video-message.hugo.html @@ -73,7 +73,7 @@ ) -}} {{ end }} -
+{{ if not $args.err }} {{ $list := slice }} {{ range $args.messages }} @@ -133,4 +133,4 @@
{{ end }} -
+{{ end }} diff --git a/component-library/helpers/component.html b/component-library/helpers/component.html index 3d3c5736..b2863507 100644 --- a/component-library/helpers/component.html +++ b/component-library/helpers/component.html @@ -32,6 +32,9 @@ {{- $background := index $component_props "background" -}} {{- $backdrop := "" -}} {{- $style := index $component_props "wrapper" -}} + {{- $width := index $component_props "width" -}} + {{- $justify := index $component_props "justify" | default "start" -}} + {{- $padding := "px-4 px-xxl-0 py-4" -}} {{- $wrapper := $style }} {{ with $background }} {{ $wrapper = partial "utilities/GetBackgroundStyle.html" (dict "background" . "class" $style) }} @@ -59,7 +62,16 @@ {{- if $backdrop -}} {{ partial "assets/live-image.html" (dict "src" $backdrop "class" (printf "background-img-fluid %s" $bgclass) "title" (T "backgroundImage")) }} {{- end -}} - {{ partial $resolved_component $component_props }} + + {{ $col := cond (and $width (lt $width 12)) (printf "col-12 col-md-%d" $width) "" }} + +
+ {{ with $col }} +
{{ partial $resolved_component $component_props }}
+ {{ else }} + {{ partial $resolved_component $component_props }} + {{ end}} +
{{ "" | safeHTML }} {{- else -}} diff --git a/data/structures/_arguments.yml b/data/structures/_arguments.yml index 9b0b0c15..89f2fe91 100644 --- a/data/structures/_arguments.yml +++ b/data/structures/_arguments.yml @@ -151,13 +151,6 @@ arguments: - full - title - none - # # TODO: rename bodyStyle - # bodyStyle: - # type: string - # optional: true - # default: lead text-muted - # comment: >- - # Style of the body text, if any.. border: type: bool optional: true @@ -355,6 +348,12 @@ arguments: - template.HTML optional: true comment: Section content displayed below the title. + content-style: + type: string + optional: true + default: lead text-muted + comment: >- + Style of the section content, if any. contrast: type: bool default: false @@ -572,17 +571,16 @@ arguments: optional: true comment: >- Heading of the content block, including a preheading and content element. - # # TODO: rename headingStyle - # headingStyle: - # type: select - # optional: true - # default: display - # options: - # values: - # - display - # - fs - # comment: >- - # Style of the heading, either display or fs (regular). + heading-style: + type: select + optional: true + default: display + options: + values: + - display + - fs + comment: >- + Style of the heading, either display style or regular style (fs). # headline: # type: string # optional: true @@ -718,7 +716,7 @@ arguments: type: select optional: true default: center - comment: Justification of the link title and icon. + comment: Justification of the child elements. options: values: - start diff --git a/data/structures/hero-image.yml b/data/structures/hero-image.yml index 2e94f98a..61faab80 100644 --- a/data/structures/hero-image.yml +++ b/data/structures/hero-image.yml @@ -11,3 +11,4 @@ arguments: wrapper: class: image-overlay: + justify: diff --git a/data/structures/hero.yml b/data/structures/hero.yml index 229b8986..da74cfea 100644 --- a/data/structures/hero.yml +++ b/data/structures/hero.yml @@ -15,6 +15,7 @@ arguments: cover: orientation: width: + justify: use-section: use-title: class: diff --git a/data/structures/section-title.yml b/data/structures/section-title.yml index bdd46256..f6de96e4 100644 --- a/data/structures/section-title.yml +++ b/data/structures/section-title.yml @@ -3,124 +3,13 @@ arguments: heading: links: color: - type: select - comment: Text color of the section. default: body - optional: true - options: - values: - - body - - primary - - secondary - - black - - white class: - type: string - optional: true - comment: Class attribute of the section title. size: - type: int - optional: true - comment: Display size of the title. - options: - min: 1 - max: 6 use-title: - type: bool - optional: true - default: false - comment: Sets the title to an HTML header instead of a div. justify: - type: select - comment: Justification of the link titles and icons. - optional: true - default: center - options: - values: - - start - - end - - center - - between - - around - - evenly - type: - type: select - optional: true - default: button - comment: Link type - options: - values: - - button - - link - section: - type: bool - optional: true - default: false - comment: >- - Trigger to use the current section as preheading, applies to single pages - only. Any preheading values takes precedence. + link-type: + use-section: arrangement: - headingStyle: - type: select - optional: true - default: display - options: - values: - - display - - fs - comment: >- - Style of the heading, either display or fs (regular). - bodyStyle: - type: string - optional: true - default: lead text-muted - comment: >- - Style of the body text, if any.. - # class: - # type: string - # optional: true - # comment: Class attribute of the illustration, e.g. "col-6". - # image: - # type: string - # optional: true - # comment: Image displayed on top of or adjacent to the headline. - # imageOverlay: - # type: bool - # optional: true - # default: false - # comment: Trigger to include an image overlay placeholder. - # ratio: - # type: select - # optional: true - # default: 16x9 - # comment: >- - # Ratio of the illustration, uses original aspect ratio by default. - # options: - # values: - # - 1x1 - # - 3x2 - # - 4x3 - # - 16x9 - # - 21x9 - # anchor: - # type: select - # optional: true - # comment: - # Anchor of the thumbnail's crop box, defaults to anchor value set in - # `imaging` section of the site configuration (usually `Smart`). - # options: - # values: - # - TopLeft - # - Top - # - TopRight - # - Left - # - Center - # - Right - # - BottomLeft - # - Bottom - # - BottomRight - # - Smart - # icon: - # type: string - # optional: true - # comment: Icon or animation displayed on top of or adjacent to the headline. \ No newline at end of file + heading-style: + content-style: diff --git a/exampleSite/content/en/_index.md b/exampleSite/content/en/_index.md index 241152ae..7ecda4eb 100644 --- a/exampleSite/content/en/_index.md +++ b/exampleSite/content/en/_index.md @@ -8,20 +8,20 @@ content_blocks: title: Welcome to Hinode! content: |- A clean documentation and blog theme for your Hugo site based on Bootstrap 5. - align: start + width: 6 background: color: primary subtle: true illustration: image: /img/sunrise.jpg ratio: 16x9 - width: 8 - width: 6 + width: 8 links: - title: About url: about icon: fas chevron-right orientation: horizontal + justify: center - _bookshop_name: articles heading: diff --git a/exampleSite/hugo_stats.json b/exampleSite/hugo_stats.json index c0d41120..f88bbf5a 100644 --- a/exampleSite/hugo_stats.json +++ b/exampleSite/hugo_stats.json @@ -100,7 +100,7 @@ "bg-body", "bg-body-tertiary", "bg-danger", - "bg-info", + "bg-info-subtle", "bg-opacity-10", "bg-primary", "bg-primary-subtle", @@ -173,7 +173,7 @@ "col-lg-2", "col-lg-4", "col-lg-8", - "col-md-", + "col-md-10", "col-md-12", "col-md-2", "col-md-3", @@ -185,9 +185,6 @@ "col-sm-12", "col-sm-3", "col-sm-6", - "col-sm-9", - "col-xl-10", - "col-xl-2", "collapse", "collapsed", "container", @@ -232,6 +229,7 @@ "fa-angle-left", "fa-arrow-left", "fa-arrow-right", + "fa-book-open", "fa-bootstrap", "fa-chevron-right", "fa-circle", @@ -239,12 +237,14 @@ "fa-circle-play", "fa-circle-question", "fa-code", + "fa-display", "fa-divide", "fa-docker", "fa-ellipsis", "fa-face-frown", "fa-facebook", "fa-fluid", + "fa-font-awesome", "fa-fw", "fa-github", "fa-globe", @@ -257,6 +257,7 @@ "fa-link", "fa-linkedin", "fa-magnifying-glass", + "fa-markdown", "fa-medium", "fa-moon", "fa-rocket", @@ -330,6 +331,7 @@ "justify-content-between", "justify-content-center", "justify-content-end", + "justify-content-md-start", "justify-content-start", "katex", "label", @@ -343,6 +345,7 @@ "link-warning", "lottie-animation", "m-0", + "m-auto", "m-md-n4", "m-n1", "main-content", @@ -410,6 +413,7 @@ "pb-3", "pb-4", "pb-5", + "pe-0", "pe-1", "pe-3", "pe-5", @@ -568,10 +572,10 @@ "animatie", "animation", "arguments", + "automated", "background-type", "badge", "barre-de-navigation", - "bento-layout", "block-diagram", "blog", "body-docs-collapse-15", @@ -587,6 +591,7 @@ "carousel-0", "carrousel", "carte", + "check-our-guides-to-get-you-started", "chronologie", "class-diagram", "cloudinary", @@ -598,158 +603,48 @@ "container", "content-blocks", "cookies-etc", + "creating-your-website-has-never-been-easier", "custom-activity", "data-tables", "docs", "documentation", "elements-type", + "embrace-the-power-of-open-source", "entity-relationship-diagram", "example", - "examples", "exemple", "fa-address-card", "fa-face-frown", + "fa-font-awesome", "fa-square-check", "fab-bootstrap", "fab-docker", "fab-facebook", "fab-github", "fab-linkedin", + "fab-markdown", "fab-medium", "fab-whatsapp", "fab-x-twitter", - "faq-0207ac25368a51b555ace9fb5d535d51", - "faq-0207ac25368a51b555ace9fb5d535d51-heading-faq-0207ac25368a51b555ace9fb5d535d51", - "faq-0207ac25368a51b555ace9fb5d535d51-item-0", - "faq-0207ac25368a51b555ace9fb5d535d51-item-1", - "faq-0207ac25368a51b555ace9fb5d535d51-item-2", - "faq-0d9cad3dcfdbf86c0dd499efd640f5fd", - "faq-0d9cad3dcfdbf86c0dd499efd640f5fd-heading-faq-0d9cad3dcfdbf86c0dd499efd640f5fd", - "faq-0d9cad3dcfdbf86c0dd499efd640f5fd-item-0", - "faq-0d9cad3dcfdbf86c0dd499efd640f5fd-item-1", - "faq-0d9cad3dcfdbf86c0dd499efd640f5fd-item-2", - "faq-1d09cf5c427b65f8401538f5c27cd79a", - "faq-1d09cf5c427b65f8401538f5c27cd79a-heading-faq-1d09cf5c427b65f8401538f5c27cd79a", - "faq-1d09cf5c427b65f8401538f5c27cd79a-item-0", - "faq-1d09cf5c427b65f8401538f5c27cd79a-item-1", - "faq-1d09cf5c427b65f8401538f5c27cd79a-item-2", - "faq-23d1dc823666431d94080a47fbe2f135", - "faq-23d1dc823666431d94080a47fbe2f135-heading-faq-23d1dc823666431d94080a47fbe2f135", - "faq-23d1dc823666431d94080a47fbe2f135-item-0", - "faq-23d1dc823666431d94080a47fbe2f135-item-1", - "faq-23d1dc823666431d94080a47fbe2f135-item-2", - "faq-2a2e900fbf55c94afccd3e0096d75d43", - "faq-2a2e900fbf55c94afccd3e0096d75d43-heading-faq-2a2e900fbf55c94afccd3e0096d75d43", - "faq-2a2e900fbf55c94afccd3e0096d75d43-item-0", - "faq-2a2e900fbf55c94afccd3e0096d75d43-item-1", - "faq-2a2e900fbf55c94afccd3e0096d75d43-item-2", - "faq-385e9a800872a4ef6fc41f292e5ecad0", - "faq-385e9a800872a4ef6fc41f292e5ecad0-heading-faq-385e9a800872a4ef6fc41f292e5ecad0", - "faq-385e9a800872a4ef6fc41f292e5ecad0-item-0", - "faq-385e9a800872a4ef6fc41f292e5ecad0-item-1", - "faq-385e9a800872a4ef6fc41f292e5ecad0-item-2", - "faq-3ac1e6c7e282c0c3498e241151e870a3", - "faq-3ac1e6c7e282c0c3498e241151e870a3-heading-faq-3ac1e6c7e282c0c3498e241151e870a3", - "faq-3ac1e6c7e282c0c3498e241151e870a3-item-0", - "faq-3ac1e6c7e282c0c3498e241151e870a3-item-1", - "faq-3ac1e6c7e282c0c3498e241151e870a3-item-2", - "faq-3c82f796666ad7126f45191d8686190a", - "faq-3c82f796666ad7126f45191d8686190a-heading-faq-3c82f796666ad7126f45191d8686190a", - "faq-3c82f796666ad7126f45191d8686190a-item-0", - "faq-3c82f796666ad7126f45191d8686190a-item-1", - "faq-3c82f796666ad7126f45191d8686190a-item-2", - "faq-42527a8d6149bcb25ba67974f251c9c7", - "faq-42527a8d6149bcb25ba67974f251c9c7-heading-faq-42527a8d6149bcb25ba67974f251c9c7", - "faq-42527a8d6149bcb25ba67974f251c9c7-item-0", - "faq-42527a8d6149bcb25ba67974f251c9c7-item-1", - "faq-42527a8d6149bcb25ba67974f251c9c7-item-2", - "faq-459acb940e821ec7b38b2425729753a7", - "faq-459acb940e821ec7b38b2425729753a7-heading-faq-459acb940e821ec7b38b2425729753a7", - "faq-459acb940e821ec7b38b2425729753a7-item-0", - "faq-459acb940e821ec7b38b2425729753a7-item-1", - "faq-459acb940e821ec7b38b2425729753a7-item-2", - "faq-4816264872fdc6847c6a813550673dd0", - "faq-4816264872fdc6847c6a813550673dd0-heading-faq-4816264872fdc6847c6a813550673dd0", - "faq-4816264872fdc6847c6a813550673dd0-item-0", - "faq-4816264872fdc6847c6a813550673dd0-item-1", - "faq-4816264872fdc6847c6a813550673dd0-item-2", - "faq-501f4a6b834aa1a24043fb5b9f9928c2", - "faq-501f4a6b834aa1a24043fb5b9f9928c2-heading-faq-501f4a6b834aa1a24043fb5b9f9928c2", - "faq-501f4a6b834aa1a24043fb5b9f9928c2-item-0", - "faq-501f4a6b834aa1a24043fb5b9f9928c2-item-1", - "faq-501f4a6b834aa1a24043fb5b9f9928c2-item-2", - "faq-524a2784206986528a599f1fad6821f4", - "faq-524a2784206986528a599f1fad6821f4-heading-faq-524a2784206986528a599f1fad6821f4", - "faq-524a2784206986528a599f1fad6821f4-item-0", - "faq-524a2784206986528a599f1fad6821f4-item-1", - "faq-524a2784206986528a599f1fad6821f4-item-2", - "faq-53c9868792ab3037787bf28bb9675fa4", - "faq-53c9868792ab3037787bf28bb9675fa4-heading-faq-53c9868792ab3037787bf28bb9675fa4", - "faq-53c9868792ab3037787bf28bb9675fa4-item-0", - "faq-53c9868792ab3037787bf28bb9675fa4-item-1", - "faq-53c9868792ab3037787bf28bb9675fa4-item-2", - "faq-74cbe70765110cf6e9067513ca5741c2", - "faq-74cbe70765110cf6e9067513ca5741c2-heading-faq-74cbe70765110cf6e9067513ca5741c2", - "faq-74cbe70765110cf6e9067513ca5741c2-item-0", - "faq-74cbe70765110cf6e9067513ca5741c2-item-1", - "faq-74cbe70765110cf6e9067513ca5741c2-item-2", - "faq-90908ae510b7d45ff54c4b6c9c8ca008", - "faq-90908ae510b7d45ff54c4b6c9c8ca008-heading-faq-90908ae510b7d45ff54c4b6c9c8ca008", - "faq-90908ae510b7d45ff54c4b6c9c8ca008-item-0", - "faq-90908ae510b7d45ff54c4b6c9c8ca008-item-1", - "faq-90908ae510b7d45ff54c4b6c9c8ca008-item-2", - "faq-9801f2465268421d28e3a2e740e301ba", - "faq-9801f2465268421d28e3a2e740e301ba-heading-faq-9801f2465268421d28e3a2e740e301ba", - "faq-9801f2465268421d28e3a2e740e301ba-item-0", - "faq-9801f2465268421d28e3a2e740e301ba-item-1", - "faq-9801f2465268421d28e3a2e740e301ba-item-2", - "faq-c4ef1fd75a3eb53e09b547b23bc8dc7d", - "faq-c4ef1fd75a3eb53e09b547b23bc8dc7d-heading-faq-c4ef1fd75a3eb53e09b547b23bc8dc7d", - "faq-c4ef1fd75a3eb53e09b547b23bc8dc7d-item-0", - "faq-c4ef1fd75a3eb53e09b547b23bc8dc7d-item-1", - "faq-c4ef1fd75a3eb53e09b547b23bc8dc7d-item-2", - "faq-d47a09f567ff25b85143b638bc68d60f", - "faq-d47a09f567ff25b85143b638bc68d60f-heading-faq-d47a09f567ff25b85143b638bc68d60f", - "faq-d47a09f567ff25b85143b638bc68d60f-item-0", - "faq-d47a09f567ff25b85143b638bc68d60f-item-1", - "faq-d47a09f567ff25b85143b638bc68d60f-item-2", - "faq-dc8be8c7cb908eadcc4f0cb98b4709fb", - "faq-dc8be8c7cb908eadcc4f0cb98b4709fb-heading-faq-dc8be8c7cb908eadcc4f0cb98b4709fb", - "faq-dc8be8c7cb908eadcc4f0cb98b4709fb-item-0", - "faq-dc8be8c7cb908eadcc4f0cb98b4709fb-item-1", - "faq-dc8be8c7cb908eadcc4f0cb98b4709fb-item-2", - "faq-df9f1eb3ec26e3252a2d045e833601d9", - "faq-df9f1eb3ec26e3252a2d045e833601d9-heading-faq-df9f1eb3ec26e3252a2d045e833601d9", - "faq-df9f1eb3ec26e3252a2d045e833601d9-item-0", - "faq-df9f1eb3ec26e3252a2d045e833601d9-item-1", - "faq-df9f1eb3ec26e3252a2d045e833601d9-item-2", - "faq-eafa3d5085c4f74847a727982753379e", - "faq-eafa3d5085c4f74847a727982753379e-heading-faq-eafa3d5085c4f74847a727982753379e", - "faq-eafa3d5085c4f74847a727982753379e-item-0", - "faq-eafa3d5085c4f74847a727982753379e-item-1", - "faq-eafa3d5085c4f74847a727982753379e-item-2", - "faq-eb4b749d4172f3bcae459d57f9d4cfb5", - "faq-eb4b749d4172f3bcae459d57f9d4cfb5-heading-faq-eb4b749d4172f3bcae459d57f9d4cfb5", - "faq-eb4b749d4172f3bcae459d57f9d4cfb5-item-0", - "faq-eb4b749d4172f3bcae459d57f9d4cfb5-item-1", - "faq-eb4b749d4172f3bcae459d57f9d4cfb5-item-2", - "faq-ff66f007edb5cdfca29cb7a3e0b4795c", - "faq-ff66f007edb5cdfca29cb7a3e0b4795c-heading-faq-ff66f007edb5cdfca29cb7a3e0b4795c", - "faq-ff66f007edb5cdfca29cb7a3e0b4795c-item-0", - "faq-ff66f007edb5cdfca29cb7a3e0b4795c-item-1", - "faq-ff66f007edb5cdfca29cb7a3e0b4795c-item-2", + "faq-0abf40cc31a1ba25c37c7b3c0cd375e6", + "faq-0abf40cc31a1ba25c37c7b3c0cd375e6-heading-faq-0abf40cc31a1ba25c37c7b3c0cd375e6", + "faq-0abf40cc31a1ba25c37c7b3c0cd375e6-item-0", + "faq-0abf40cc31a1ba25c37c7b3c0cd375e6-item-1", + "faq-0abf40cc31a1ba25c37c7b3c0cd375e6-item-2", "fas-1", "fas-2", "fas-3", "fas-angle-left", "fas-arrow-left", "fas-arrow-right", + "fas-book-open", "fas-chevron-right", "fas-circle", "fas-circle-check", "fas-circle-play", "fas-circle-question", "fas-code", + "fas-display", "fas-divide", "fas-ellipsis", "fas-globe", @@ -767,6 +662,7 @@ "fas-sun", "fas-timeline", "fas-up-right-from-square", + "fast", "fichier", "fil-dariane", "file", @@ -780,7 +676,6 @@ "git-graph", "groupe-de-boutons", "groupe-de-cartes", - "guides", "gérer-les-préférences-des-cookies", "heading", "heading-type", @@ -813,6 +708,7 @@ "messages-type", "mindmap", "more-type", + "multilingual", "nav", "nav-0-0", "nav-0-1", @@ -830,6 +726,7 @@ "navbar-sample-collapse", "navigation", "notification", + "optimized", "overview", "persona", "pie-chart", @@ -841,7 +738,9 @@ "que-sont-les-cookies-", "release", "requirement-chart", + "responsive", "réduire", + "secure", "security", "sequence-diagram", "spinner", diff --git a/layouts/_partials/assets/card-group.html b/layouts/_partials/assets/card-group.html index 9a3d7986..a8c4ba5f 100644 --- a/layouts/_partials/assets/card-group.html +++ b/layouts/_partials/assets/card-group.html @@ -136,8 +136,7 @@ {{/* Main code */}} {{- if and (not $error) (or (gt (len $elements) 0) $args.cards) -}} -
-
+
@@ -198,5 +197,4 @@ {{ $args.hrefTitle }} {{- end -}} {{- end -}} -
{{- end -}} \ No newline at end of file diff --git a/layouts/_partials/assets/card.html b/layouts/_partials/assets/card.html index c73289e8..6855f4be 100644 --- a/layouts/_partials/assets/card.html +++ b/layouts/_partials/assets/card.html @@ -148,19 +148,19 @@ {{ if $thumbnail }} {{ if eq $args.orientation "horizontal-sm" }} {{ $stack = "fa-1x" }} - {{ $col1 = "col-4 col-md-2" }} + {{ $col1 = "col-4 col-md-2 pe-0" }} {{ $col2 = "col-8 col-md-10" }} {{ else }} - {{ $col1 = "col-4" }} + {{ $col1 = "col-4 pe-0" }} {{ $col2 = "col-8" }} {{ end }} {{ else if $icon }} {{ if eq $args.orientation "horizontal-sm" }} {{ $stack = "fa-1x" }} - {{ $col1 = "col-2 col-sm-3 col-md-4 col-xl-2" }} - {{ $col2 = "col-10 col-sm-9 col-md-8 col-xl-10" }} + {{ $col1 = "col-4 col-md-2 pe-0" }} + {{ $col2 = "col-8 col-md-10" }} {{ else }} - {{ $col1 = "col-4" }} + {{ $col1 = "col-4 pe-0" }} {{ $col2 = "col-8" }} {{ end }} diff --git a/layouts/_partials/assets/hero-image.html b/layouts/_partials/assets/hero-image.html index e4794c05..99bfe5d8 100644 --- a/layouts/_partials/assets/hero-image.html +++ b/layouts/_partials/assets/hero-image.html @@ -16,8 +16,8 @@ )}} {{ end }} -{{ if not $args.err }} -
+{{ if and (not $args.err) (or $args.image $args.icon) }} +
{{ partial "assets/featured-illustration.html" (dict "page" $args.page "icon" $args.icon diff --git a/layouts/_partials/assets/hero.html b/layouts/_partials/assets/hero.html index 1a2dd6fa..1cf8da58 100644 --- a/layouts/_partials/assets/hero.html +++ b/layouts/_partials/assets/hero.html @@ -25,19 +25,17 @@ {{/* Initialize local variables */}} {{ $align := $args.align }} -{{ if and (not $align) (eq $args.orientation "stacked") }}{{ $align = "center" }}{{ end }} -{{ $class := $args.class }} +{{ $class := $args.class | default "" }} {{ $scale := $args.illustration.width }} {{ if $scale }} - {{ $class = trim (printf "%s col-%d " $class $scale) " " }} + {{ $class = trim (printf "%s col-%d text-center text-md-%s" $class $scale $align) " " }} {{ else }} - {{ $class = trim (printf "%s col-8 col-md-12" $class) " " }} {{ $scale = 12 }} {{ end }} {{ $iconWrapper := "col-6" }} -{{ if $args.center }}{{ $iconWrapper = "col-6 mx-auto text-center" }}{{ end }} +{{ $heading := cond (eq $args.orientation "horizontal") (merge $args.heading (dict "width" 12)) $args.heading }} {{ $sizes := "100vw" }} {{ if or (lt $args.width 12) (lt $scale 12) }} @@ -58,79 +56,77 @@ {{ end }} {{ if not $error }} -
- {{ if and $args.breadcrumb (not page.IsHome) }} -
- {{ if site.Params.env_bookshop_live }} - Breadcrumb preview not supported - {{ else }} - {{ partial "assets/breadcrumb.html" (dict "page" page) }} - {{ end }} -
- {{ end }} + {{ if and $args.breadcrumb (not page.IsHome) }} +
+ {{ if site.Params.env_bookshop_live }} + Breadcrumb preview not supported + {{ else }} + {{ partial "assets/breadcrumb.html" (dict "page" page) }} + {{ end }} +
+ {{ end }} - {{ $imageWrapper := printf "mx-auto mx-md-0 %s" $class }} - {{ if eq $args.orientation "stacked" }} - {{ $imageWrapper = printf "pt-5 %s" $class }} - {{ if $args.center }}{{ $imageWrapper = printf "%s mx-auto" $imageWrapper }}{{ end }} - {{ if $args.icon }}{{ $imageWrapper = $iconWrapper }}{{ end }} - {{ end }} - - {{ $sectionClass := cond (eq $args.orientation "stacked") "pt-5" "py-md-5" }} + {{ $imageWrapper := printf "mx-md-0 text-%s %s" $align $class }} + {{ $imageJustify := "" }} + {{ if eq $args.orientation "stacked" }} + {{ $imageWrapper = printf "pt-5 text-center %s" $class }} {{ if $args.icon }}{{ $imageWrapper = $iconWrapper }}{{ end }} + {{ else }} + {{ $imageJustify = $align }} + {{ end }} - {{ $illustration := partial $args.hook (dict - "page" $args.page - "image" $args.illustration.image - "icon" $args.illustration.icon - "anchor" $args.illustration.anchor - "mode" $args.illustration.mode - "ratio" $args.illustration.ratio - "sizes" $sizes - "title" (T "heroImage") - "wrapper" $imageWrapper - "class" "hero-image" - "image-overlay" $args.imageOverlay - ) }} + {{ $sectionClass := cond (eq $args.orientation "stacked") "pt-5" "py-md-5" }} + {{ if $args.icon }}{{ $imageWrapper = $iconWrapper }}{{ end }} - {{ $title := partial "assets/section-title.html" (dict - "heading" $args.heading - "use-title" $args.useTitle - "size" $args.size - "links" $args.links - "type" (or $args.linkType $args.type) - "class" (printf "hero-title %s" $sectionClass) - "arrangement" $arrangement - ) }} + {{ $illustration := partial $args.hook (dict + "page" $args.page + "image" $args.illustration.image + "icon" $args.illustration.icon + "anchor" $args.illustration.anchor + "mode" $args.illustration.mode + "ratio" $args.illustration.ratio + "sizes" $sizes + "title" (T "heroImage") + "wrapper" $imageWrapper + "class" "hero-image" + "image-overlay" $args.imageOverlay + "justify" $imageJustify + ) }} - {{ if eq $args.orientation "stacked" }} - {{/* Render stacked component */}} -
-
- {{ $illustration | safeHTML }} - {{ $title | safeHTML }} -
+ {{ $title := partial "assets/section-title.html" (dict + "heading" $heading + "use-title" $args.useTitle + "size" $args.size + "links" $args.links + "link-type" (or $args.linkType $args.type) + "class" (printf "hero-title %s" $sectionClass) + "arrangement" $arrangement + ) }} + + {{ if eq $args.orientation "stacked" }} + {{/* Render stacked component */}} + + {{ $illustration | safeHTML }} + {{ $title | safeHTML }} + {{ else }} + {{/* Render horizontal component */}} +
+ {{ $order1 := "order-1 order-md-0" }} + {{ $order2 := "order-0 order-md-1" }} + {{ if eq $args.order "first" }} + {{ $order1 = "order-1" }} + {{ $order2 = "order-0" }} + {{ end }} + + {{ $imgWidth := sub 12 (or $args.heading.width 12) }} + {{ if lt $imgWidth 1 }}{{ $imgWidth = 1 }}{{ end }} + +
+ {{ $title | safeHTML }}
- {{ else }} - {{/* Render horizontal component */}} -
- {{ $order1 := "order-1 order-md-0 " }} - {{ $order2 := "order-0 order-md-1" }} - {{ if eq $args.order "first" }} - {{ $order1 = "order-1" }} - {{ $order2 = "order-0" }} - {{ end }} - -
- {{ $title | safeHTML }} -
-
-
- {{ $illustration | safeHTML }} -
-
+
+ {{ $illustration | safeHTML }}
- {{ end }} -
+
+ {{ end }} {{ end }} \ No newline at end of file diff --git a/layouts/_partials/assets/section-title.html b/layouts/_partials/assets/section-title.html index fa369c84..3a4bac54 100644 --- a/layouts/_partials/assets/section-title.html +++ b/layouts/_partials/assets/section-title.html @@ -15,16 +15,15 @@ {{ end }} {{/* Initialize local arguments */}} -{{- $size := (or .size site.Params.modules.bookshop.title.size) | default 4 -}} -{{- $arrangement := (or .arrangement site.Params.modules.bookshop.title.arrangement) | default "above" -}} -{{- $headingStyle := (or .headingStyle site.Params.modules.bookshop.title.headingStyle) | default "display" -}} -{{- $bodyStyle := (or .bodyStyle site.Params.modules.bookshop.title.bodyStyle) | default "lead text-muted" -}} +{{- $size := (or $args.size site.Params.modules.bookshop.title.size) | default 4 -}} +{{- $arrangement := (or $args.arrangement site.Params.modules.bookshop.title.arrangement) | default "above" -}} +{{- $headingStyle := (or $args.headingStyle site.Params.modules.bookshop.title.headingStyle) | default "display" -}} +{{- $contentStyle := (or $args.contentStyle site.Params.modules.bookshop.title.contentStyle) | default "lead text-muted" -}} {{- $preheading := $args.heading.preheading }} {{- $title := $args.heading.title }} +{{- $width := $args.heading.width | default 12 -}} -{{ if and (not $preheading) $args.section }} - {{ $preheading = page.CurrentSection.Name }} -{{ end }} +{{ if and (not $preheading) $args.useSection }}{{ $preheading = page.CurrentSection.Name }}{{ end }} {{ if site.Params.main.titleCase }} {{ $preheading = title $preheading }} @@ -35,41 +34,76 @@ {{ define "_partials/assets/section-title-header.html" }} {{ $headingStyle := .headingStyle }} + {{ if (index . "use-title") }} {{ $title := .title | page.RenderString }} {{ $label := trim (replaceRE "\r\n?|\n" " " ($title | plainify)) " " }}

{{ .title | page.RenderString | safeHTML }}

+ class="{{ $headingStyle }}-{{ .size }}{{ with .color }} text-{{ . }}{{ end }} pt-1"> + {{ .title | page.RenderString | safeHTML }} + {{ else }} -
{{ .title | page.RenderString | safeHTML }}
+
+ {{ .title | page.RenderString | safeHTML }} +
{{ end }} {{ end }} +{{ $header := "" }} +{{ if $title }} + {{ $header = partial "assets/section-title-header.html" (dict + "use-title" $args.useTitle + "title" $title + "headingStyle" $headingStyle + "color" $args.color + "size" $size + ) }} +{{ end }} + +{{ $links := "" }} +{{ if $args.links }} + {{ $links = partial "assets/links.html" (dict + "page" $args.page + "links" $args.links + "align" $args.heading.align + "justify" $args.justify + "link-type" $args.linkType + ) }} +{{ end }} + +{{ $imgArgs := dict + "page" page + "icon" $args.icon + "image" $args.image + "anchor" $args.anchor + "mode" true + "sizes" "20vw" + "title" (T "heroImage") + "mode" $args.mode +}} + -
+
{{ if and $preheading (eq $arrangement "first") }}
- {{ with $preheading }}

{{ . | page.RenderString | safeHTML }}

{{ end }} + {{ with $preheading }} +

+ {{ . | page.RenderString | safeHTML }} +

+ {{ end }}
- {{ with $title }}{{ partial "assets/section-title-header.html" (dict "use-title" $args.useTitle "title" . "headingStyle" $headingStyle "color" $args.color "size" $size) }}{{ end }} - {{ with $args.heading.content }}
{{ . | page.RenderString | safeHTML }}
{{ end }} - {{ if .links }}{{ partial "assets/links.html" (dict "page" $args.page "links" $args.links "align" $args.heading.align "justify" $args.justify "link-type" $args.type) }}{{ end }} + {{ $header }} + {{ with $args.heading.content }} +
{{ . | page.RenderString | safeHTML }}
+ {{ end }} + {{ $links }}
- {{ partial "assets/featured-illustration.html" (dict - "page" page - "icon" $args.icon - "image" $args.image - "anchor" $args.anchor - "mode" true - "sizes" "20vw" - "wrapper" (printf "col-4 col-%s-12 mx-auto pt-4 pt-%s-0" $breakpoint.prev $breakpoint.prev) - "title" (T "heroImage") - "mode" $args.mode - ) }} + {{ $wrapper := (printf "col-4 col-%s-12 mx-auto pt-4 pt-%s-0" $breakpoint.prev $breakpoint.prev) }} + {{ partial "assets/featured-illustration.html" (merge $imgArgs (dict "wrapper" $wrapper)) }}
@@ -79,31 +113,29 @@
- {{ with $preheading }}

{{ . | page.RenderString | safeHTML }}

{{ end }} - {{ with $title }}{{ partial "assets/section-title-header.html" (dict "use-title" $args.useTitle "title" . "headingStyle" $headingStyle "color" $args.color "size" $size) }}{{ end }} - {{ with $args.heading.content }}
{{ . | page.RenderString | safeHTML }}
{{ end }} - {{ if .links }}{{ partial "assets/links.html" (dict "page" $args.page "links" $args.links "align" $args.heading.align "justify" $args.justify "link-type" $args.type) }}{{ end }} + {{ with $preheading }} +

+ {{ . | page.RenderString | safeHTML }} +

+ {{ end }} + {{ $header }} + {{ with $args.heading.content }}
{{ . | page.RenderString | safeHTML }}
{{ end }} + {{ $links }}
- {{ partial "assets/featured-illustration.html" (dict - "page" page - "icon" $args.icon - "image" $args.image - "anchor" $args.anchor - "mode" true - "ratio" $args.ratio - "sizes" "20vw" - "wrapper" "mx-auto" - "title" (T "heroImage") - "mode" $args.mode - ) }} + {{ $wrapper := (printf "col-4 col-%s-12 mx-auto pt-4 pt-%s-0" $breakpoint.prev $breakpoint.prev) }} + {{ partial "assets/featured-illustration.html" (merge $imgArgs (dict "ratio" $args.ratio "wrapper" "mx-auto")) }}
{{ else }} - {{ with $preheading }}

{{ . | page.RenderString | safeHTML }}

{{ end }} - {{ with $title }}{{ partial "assets/section-title-header.html" (dict "use-title" $args.useTitle "title" . "headingStyle" $headingStyle "color" $args.color "size" $size) }}{{ end }} - {{ with $args.heading.content }}
{{ . | page.RenderString | safeHTML }}
{{ end }} - {{ if $args.links }}{{ partial "assets/links.html" (dict "page" $args.page "links" $args.links "align" $args.heading.align "justify" $args.justify "link-type" $args.type) }}{{ end }} + {{ with $preheading }} +

+ {{ . | page.RenderString | safeHTML }} +

+ {{ end }} + {{ $header }} + {{ with $args.heading.content }}
{{ . | page.RenderString | safeHTML }}
{{ end }} + {{ $links }} {{ end }}
diff --git a/layouts/_partials/assets/timeline.html b/layouts/_partials/assets/timeline.html index 1e304895..ba31204d 100644 --- a/layouts/_partials/assets/timeline.html +++ b/layouts/_partials/assets/timeline.html @@ -102,7 +102,7 @@ "use-title" $args.useTitle "size" $args.size "links" $args.links - "type" (or $args.linkType $args.type) + "link-type" (or $args.linkType $args.type) "class" "pb-4" "arrangement" $arrangement ) }}