Merge 477633a62a into 0989c28a0e

In Site config
    homeInfoParams:
        AlignSocialIconsTo: "center" # or left or right

assets/css/common/main.css

@@ -27,12 +27,10 @@
     margin-inline-start: auto;
 }
 
-.social-icons {
-    padding: 12px 0;
-}
 
-.social-icons a:not(:last-of-type) {
-    margin-inline-end: 12px;
+.social-icons a {
+    display: inline-flex;
+    padding: 10px;
 }
 
 .social-icons a svg {

assets/css/common/profile-mode.css

@@ -10,19 +10,20 @@
     text-align: center;
 }
 
-.profile .profile_inner h1 {
-    padding: 12px 0;
+.profile .profile_inner {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 10px;
 }
 
 .profile img {
-    display: inline-table;
     border-radius: 50%;
 }
 
 .buttons {
     flex-wrap: wrap;
     max-width: 400px;
-    margin: 0 auto;
 }
 
 .button {

layouts/_default/archives.html

@@ -68,6 +68,7 @@
   </div>
   {{- end }}
 </div>
+{{- partial "adsense-infeed.html" $ -}}
 {{- end }}
 {{- end }}
 

layouts/_default/single.html

@@ -39,6 +39,7 @@
     {{- if not (.Param "disableAnchoredHeadings") }}
     {{- partial "anchored_headings.html" .Content -}}
     {{- else }}{{ .Content }}{{ end }}
+    {{ partial "adsense-inarticle.html" $ }}
   </div>
   {{- end }}
 
@@ -60,6 +61,7 @@
   {{- if (.Param "comments") }}
   {{- partial "comments.html" . }}
   {{- end }}
+  {{ partial "adsense-multiplex.html" $ }}
 </article>
 
 {{- end }}{{/* end main */}}

layouts/partials/adsense-display.html

@@ -0,0 +1,10 @@
+<!-- ad-display -->
+<ins class="adsbygoogle"
+    style="display:block"
+    data-ad-client="{{- .Site.Params.adsense.clientID -}}"
+    data-ad-slot="{{- .Site.Params.adsense.slotDisplay -}}"
+    data-ad-format="auto"
+    data-full-width-responsive="true"></ins>
+<script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+</script>

layouts/partials/adsense-inarticle.html

@@ -0,0 +1,10 @@
+<!-- ad-in-article -->
+<ins class="adsbygoogle"
+    style="display:block; text-align:center;"
+    data-ad-layout="in-article"
+    data-ad-format="fluid"
+    data-ad-client="{{- .Site.Params.adsense.clientID -}}"
+    data-ad-slot="{{- .Site.Params.adsense.slotInArticle -}}"></ins>
+<script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+</script>

layouts/partials/adsense-infeed.html

@@ -0,0 +1,16 @@
+<!-- ad-in-feed -->
+<ins class="adsbygoogle"
+    style="display:block"
+    data-ad-format="fluid"
+    data-ad-layout-key="-gw-3+1f-3d+2z"
+    data-ad-client="{{- .Site.Params.adsense.clientID -}}"
+    data-ad-slot="{{- .Site.Params.adsense.slotInFeed -}}"></ins>
+<!-- <ins class="adsbygoogle imgtheme-dark"
+    style="display:block"
+    data-ad-format="fluid"
+    data-ad-layout-key="-gw-3+1f-3d+2z"
+    data-ad-client="{{- .Site.Params.adsense.clientID -}}"
+    data-ad-slot="{{- .Site.Params.adsense.slotInFeedDark -}}"></ins> -->
+<script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+</script>

layouts/partials/adsense-multiplex.html

@@ -0,0 +1,9 @@
+<!-- ad-multiplex -->
+<ins class="adsbygoogle"
+    style="display:block"
+    data-ad-format="autorelaxed"
+    data-ad-client="{{- .Site.Params.adsense.clientID -}}"
+    data-ad-slot="{{- .Site.Params.adsense.slotMultiplex -}}"></ins>
+<script>
+    (adsbygoogle = window.adsbygoogle || []).push({});
+</script>

layouts/partials/head.html

@@ -167,4 +167,5 @@
 {{- template "partials/templates/opengraph.html" . }}
 {{- template "partials/templates/twitter_cards.html" . }}
 {{- template "partials/templates/schema_json.html" . }}
+{{- template "partials/templates/adsense.html" . }}
 {{- end -}}

layouts/partials/home_info.html

@@ -7,7 +7,7 @@
         {{ .Content | markdownify }}
     </div>
     <footer class="entry-footer">
-        {{ partial "social_icons.html" site.Params.socialIcons }}
+        {{ partial "social_icons.html" (dict "align" site.Params.homeInfoParams.AlignSocialIconsTo) }}
     </footer>
 </article>
 {{- end -}}

layouts/partials/index_profile.html

@@ -32,7 +32,7 @@
         {{- end }}
         <h1>{{ .title | default site.Title | markdownify }}</h1>
         <span>{{ .subtitle | markdownify }}</span>
-        {{- partial "social_icons.html" site.Params.socialIcons -}}
+        {{- partial "social_icons.html" -}}
 
         {{- with .buttons }}
         <div class="buttons">

layouts/partials/social_icons.html

@@ -1,6 +1,7 @@
-<div class="social-icons">
-    {{- range . }}
-    <a href="{{ trim .url " " | safeURL }}" target="_blank" rel="noopener noreferrer me" title="{{ (.title | default .name) | title }}">
+<div class="social-icons" {{ with .align}}align="{{.}}" {{- end }}>
+    {{- range site.Params.socialIcons }}
+    <a href="{{ trim .url " " | safeURL }}" target="_blank" rel="noopener noreferrer me"
+        title="{{ (.title | default .name) | title }}">
         {{ partial "svg.html" . }}
     </a>
     {{- end }}

layouts/partials/templates/adsense.html

@@ -0,0 +1,6 @@
+{{ $adsenseEnabled := (and .Site.Params "adsense" (ne .Params.disableAdsense true) ) }}
+{{ $adsenseAllowedOnPage := (ne .Kind "404" )}}
+
+{{- if (and $adsenseEnabled $adsenseAllowedOnPage) }}
+<script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client={{- .Site.Params.adsense.clientID -}}" crossorigin="anonymous"></script>
+{{- end }}

layouts/shortcodes/adarticle.html

@@ -0,0 +1 @@
+{{ partial "adsense-inarticle.html" $ }}

layouts/shortcodes/addisplay.html

@@ -0,0 +1 @@
+{{ partial "adsense-display.html" $ }}

layouts/shortcodes/adfeed.html

@@ -0,0 +1 @@
+{{ partial "adsense-infeed.html" $ }}

layouts/shortcodes/admulti.html

@@ -0,0 +1 @@
+{{ partial "adsense-multiplex.html" $ }}