Merge branch 'main' into categories

assets/sass/_theme/blocks/call_to_action.sass

@@ -7,6 +7,11 @@
             margin-bottom: $spacing0
             + .description
                 margin-top: 0
+        .description
+            * + ul, * + ol
+                margin-top: space(4)
+            ul:last-child, ol:last-child
+                margin-bottom: 0
     .call_to_action
         color: $block-call-to-action-color
         .description
@@ -128,7 +133,6 @@
                     display: flex
                     flex-direction: column
                     grid-column: 10/13
-                    grid-row: 2
                     margin-top: 0
                     a
                         margin-right: 0
@@ -136,6 +140,10 @@
                             margin-top: 0
                     a + a
                         margin-top: $spacing1
+            &.call_to_action--with-title
+                .actions
+                    grid-row: 2
+
             @include media-breakpoint-down(lg)
                 > div
                     .top

layouts/partials/blocks/templates/call_to_action.html

@@ -6,7 +6,7 @@
   <div class="{{ $block_class }}">
     <div class="container">
       <div class="block-content">
-        <div class="call_to_action call_to_action--with{{ if not .image }}out{{ end }}-image">
+        <div class="call_to_action call_to_action--with{{ if not .image }}out{{ end }}-image {{ if $block.title }}call_to_action--with-title{{ end }}">
           <div>
             {{ partial "blocks/top.html" (dict
               "title" $block.title
@@ -15,22 +15,22 @@
             )}}
 
             {{- if .buttons }}
-            <div class="actions" {{ if gt (len .buttons) 1 }}role="group"{{ end -}}>
-              {{- range .buttons -}}
-                {{ if .title }}
-                  {{- $title := partial "PrepareHTML" .title -}}
-                  <a href="{{ .url }}"
-                    {{ if .target_blank }}
-                      title="{{ i18n "commons.link.blank_aria" (dict "Title" $title) }}"
-                      target="_blank"
-                    {{ else }}
-                      title="{{ $title }}"
-                    {{ end }}
-                    >{{- $title -}}
-                  </a>
-                {{ end -}}
-              {{- end -}}
-            </div>
+              <div class="actions" {{ if gt (len .buttons) 1 }}role="group"{{ end -}}>
+                {{- range .buttons -}}
+                  {{ if .title }}
+                    {{- $title := partial "PrepareHTML" .title -}}
+                    <a href="{{ .url }}"
+                      {{ if .target_blank }}
+                        title="{{ i18n "commons.link.blank_aria" (dict "Title" $title) }}"
+                        target="_blank"
+                      {{ else }}
+                        title="{{ $title }}"
+                      {{ end }}
+                      >{{- $title -}}
+                    </a>
+                  {{ end -}}
+                {{- end -}}
+              </div>
             {{- end -}}
           </div>
 

layouts/partials/commons/menu.html

@@ -32,7 +32,7 @@
       {{- $item_class = printf "%shas-children" $item_class -}}
       {{ range .children -}}
         {{- if eq $context.RelPermalink .target }}
-          {{ $link_class = printf "$link_class %s" "has-children-active" }}
+          {{ $link_class = printf "%s %s" $link_class "has-children-active" }}
         {{ end }}
       {{ end -}}
     {{- end -}}