Merge pull request #2 from reorx/master

Sync with upstream reorx/hugo-PaperModx:master
Triple-Z · Jan 23, 2023 · c56c7cb · c56c7cb
2 parents f867ba3 + 08aad53
commit c56c7cb
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 19 deletions.
diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss
@@ -13,6 +13,7 @@ body.type-newsletter {
   --signature: #CB3A56;
   --signature-bg: rgba(203, 58, 87, 0.239);
   --signature-bg-dim: rgba(203, 58, 87, 0.147);
+  --signature-bg-dimmer: rgba(203, 58, 87, 0.084);
   --main-border: 5px solid var(--signature);
   --icon-length: 50px;
   --icon-font-size: 32px;
@@ -43,19 +44,27 @@ body.type-newsletter {
   }
 
   /* shared */
-  .sub-form {
-    display: flex;
-    flex-direction: column;
-    margin: calc(var(--content-gap) * 1.5) 0;
+  .subscribe-form {
+    margin: calc(var(--content-gap) * 2) 0;
+
     form {
       display: flex;
+      flex-direction: column;
       line-height: 1.2em;
       flex-wrap: wrap;
     }
-    input {
+    .input-group {
+      display: flex;
+      flex-wrap: wrap;
+    }
+    .subscribe-option {
+      margin-top: 8px;
+    }
+    input[type=text] {
       border: 3px solid var(--signature-bg-dim);
       color: var(--secondary);
       border-radius: 0px;
+      border-color: var(--signature-bg);
       appearance: none;
       outline: none;
       background-color: var(--theme);
@@ -76,13 +85,40 @@ body.type-newsletter {
       margin-left: var(--content-gap);
       white-space: nowrap;
     }
+    label, .label {
+      font-size: .85em;
+      margin-right: 16px;
+    }
+    .label {
+      color: var(--secondary);
+      line-height: 1.2;
+    }
+    input[type=radio] {
+      margin-left: 0;
+      margin-top: 0;
+    }
   }
+
   @media screen and (max-width: $small) {
-    .sub-form {
+    .subscribe-form {
+      font-size: .9em;
+      input[type=text] {
+        padding-left: 8px;
+        padding-right: 8px;
+      }
       button {
+        width: 96px;
         margin-left: 0;
-        margin-top: calc(var(--content-gap)/2);
-        flex-grow: 1;
+        padding-left: 0;
+        padding-right: 0;
+      }
+      .hide-for-sm {
+        display: none;
+      }
+      .label {
+        display: block;
+        width: 100%;
+        margin-bottom: 4px;
       }
     }
   }
@@ -284,18 +320,15 @@ body.type-newsletter.kind-page {
 
   .newsletter-sub {
     margin-top: calc(var(--content-gap) * 1.5);
-    background-color: var(--signature-bg-dim);
-    padding: 1em;
+    background-color: var(--signature-bg-dimmer);
+    padding: var(--content-gap) var(--gap);
     .notice {
-      font-size: .8em;
+      font-size: .9em;
       color: var(--signature);
       line-height: 1.6;
     }
-    .sub-form {
-      margin: 1em 0;
-      input {
-        border-color: var(--signature-bg);
-      }
+    .subscribe-form {
+      margin: var(--content-gap) 0 0;
     }
   }
 }
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -60,7 +60,8 @@ <h1 class="post-title">
     {{- if $isNewsletter }}
       <div class="newsletter-sub">
         <div class="notice">
-          感谢你能读到这里，如果觉得有趣的话，欢迎在下方输入邮箱进行订阅。
+          <div style="font-weight: bold">Thanks for reading, if you like it, please subscribe below.</div>
+          <div style="font-size: .85em; margin-top: 8px;">感谢你能读到这里，如果觉得有趣的话，欢迎在下方输入邮箱进行订阅。</div>
         </div>
         {{- partial "newsletter_sub_form.html"}}
       </div>

diff --git a/layouts/_default/sitemap.xml b/layouts/_default/sitemap.xml
@@ -0,0 +1,24 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  {{ range .Data.Pages }}
+    {{- if and (not .Params.nositemap) .Permalink -}}
+  <url>
+    <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
+    <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
+    <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
+    <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ if .IsTranslated }}{{ range .Translations }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Language.Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+    <xhtml:link
+                rel="alternate"
+                hreflang="{{ .Language.Lang }}"
+                href="{{ .Permalink }}"
+                />{{ end }}
+  </url>
+    {{- end -}}
+  {{ end }}
+</urlset>
diff --git a/layouts/partials/newsletter_sub_form.html b/layouts/partials/newsletter_sub_form.html
@@ -1,8 +1,8 @@
 {{/* Add `layouts/partials/newsletter_sub_form.html` in your own code to customize the form */}}
 
-<div class="sub-form">
+<div class="subscribe-form">
   <form action="">
     <input type="text" name="email" placeholder="Your email address">
-    <button>订阅 | Subscribe</button>
+    <button>Subscribe | 订阅</button>
   </form>
 </div>