Merge branch 'main' of https://github.com/noesya/osuny-hugo-theme-aaa

c3ef29d3 · alexisben · ccfbfeac · 2578d384 · c3ef29d3 · c3ef29d3
Commit c3ef29d3 authored 1 year ago by alexisben
--- a/assets/sass/_theme/blocks/pages.sass
+++ b/assets/sass/_theme/blocks/pages.sass
@@ -12,6 +12,8 @@
                @include handle-svg-fit
                order: -1
                margin-bottom: $spacing1
+                &:empty
+                    display: none
                img
                    display: block
                    aspect-ratio: 16/9

--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
+    {{ partial "head/csp.html" }}
    {{ partial "head/css.html" }}
    {{ partial "head/seo.html" . }}
    {{ partial "head/favicons.html" . }}

--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -14,6 +14,7 @@
 {{- with .block.data -}}
  {{- $layout := .layout -}}
+  {{- $with_link := .with_link -}}
  {{- if $layout -}}
    {{- $layout_class = printf "block-partners--%s" $layout -}}
@@ -38,6 +39,7 @@
        {{- partial (printf "blocks/templates/partners/%s.html" $layout) (dict 
            "partners" .partners
            "logo_index" $logo_index
+            "with_link" $with_link
          ) }}
      </div>
    </div>
@@ -51,7 +53,7 @@
  {{ if .title }}
    {{ $title = partial "PrepareHTML" .title -}}
    <h3>
-      {{- if .url }}
+      {{- if and .url .with_link }}
        <a href="{{ .url }}" {{ if .external }} target="_blank" rel="noopener" {{ end }} title="{{ safeHTML (i18n "commons.link.blank_aria" (dict "Title" $title)) }}">
      {{ end -}}
        {{- $title -}}

--- a/layouts/partials/blocks/templates/partners/grid.html
+++ b/layouts/partials/blocks/templates/partners/grid.html
 {{ $logo_index := .logo_index }}
+{{ $with_link := .with_link }}
 <div class="grid organizations">
  {{- range .partners }}
@@ -8,6 +9,7 @@
            "title" .Title
            "url" .Permalink
            "logo" (index .Params $logo_index)
+            "with_link" $with_link
          )}}
      {{ end }}
    {{ else }}
@@ -16,6 +18,7 @@
          "url" .url
          "external" true
          "logo" .logo
+          "with_link" $with_link
        )}}
    {{ end }}
  {{ end -}}

--- a/layouts/partials/head/csp.html
+++ b/layouts/partials/head/csp.html
+{{- with site.Data.website.external_domains -}}
+<meta
+  http-equiv="Content-Security-Policy"
+  content="default-src 'self' {{ delimit . " " }} {{ if not hugo.IsProduction }}'unsafe-inline'{{ end }}" />
+{{- end -}}
\ No newline at end of file