v2.0.0-beta (#171)

* A brand new design * Add share * Style optimized * v2.0.0-beta * Update
g1eny0ung · Feb 1, 2021 · 0fc1ce1 · 0fc1ce1
1 parent e4de25c
commit 0fc1ce1
Show file tree

Hide file tree

Showing 36 changed files with 480 additions and 511 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Because of the site rewriting, I started to calculate the version again.
 
+## [2.0.0-beta] - 2021.01.31
+
+- New `header` component
+- At the same time, remove some clutter or repetitive elements
+- Deprecate `categoriesLimitInHeader` param
+- Replace `headerBottomText` param to `footerBottomText`
+- Improve semantic HTML tags
+- Add share buttons in post page
+
 ## [1.6.0] - 2021.01.30
 
 - Process term name with humanize | title

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 ![Hugo min version](https://img.shields.io/badge/hugo--min--version-0.57.2-important)
 ![GitHub](https://img.shields.io/github/license/g1eny0ung/hugo-theme-dream)
 
+- [The next version is out](#the-next-version-is-out)
 - [Note After v1.1.0](#note-after-v110)
 - [Major update in 2019-11-10](#major-update-in-2019-11-10)
 - [Intro](#intro)
@@ -12,6 +13,16 @@
 - [Example](#example)
 - [Publish](#publish)
 
+## The next version is out
+
+> If you still want to use the old version, you can check out the branch to `release-1.6`.
+
+The new version brings some new design elements and bug fixes. When it stabilizes, it will be released as `v2.0.0`.
+
+All changes will be committed to the `master` branch. You can check the screenshot below to see the rough interface changes.
+
+For more detail, please refer to the [Release v2.0.0-beta](https://github.com/g1eny0ung/hugo-theme-dream/releases/tag/v2.0.0-beta)
+
 ## Note After v1.1.0
 
 > It's needed to set the **`about`** folder to **`Headless Bundle`**.

diff --git a/docs/README.md b/docs/README.md
@@ -4,6 +4,7 @@
 ![Hugo min version](https://img.shields.io/badge/hugo--min--version-0.57.2-important)
 ![GitHub](https://img.shields.io/github/license/g1eny0ung/hugo-theme-dream)
 
+- [The next version is out](#the-next-version-is-out)
 - [Note After v1.1.0](#note-after-v110)
 - [Major update in 2019-11-10](#major-update-in-2019-11-10)
 - [Intro](#intro)
@@ -12,6 +13,16 @@
 - [Example](#example)
 - [Publish](#publish)
 
+## The next version is out
+
+> If you still want to use the old version, you can check out the branch to `release-1.6`.
+
+The new version brings some new design elements and bug fixes. When it stabilizes, it will be released as `v2.0.0`.
+
+All changes will be committed to the `master` branch. You can check the screenshot below to see the rough interface changes.
+
+For more detail, please refer to the [Release v2.0.0-beta](https://github.com/g1eny0ung/hugo-theme-dream/releases/tag/v2.0.0-beta)
+
 ## Note After v1.1.0
 
 > It's needed to set the **`about`** folder to **`Headless Bundle`**.

diff --git a/docs/params-configurations.md b/docs/params-configurations.md
@@ -4,17 +4,17 @@
 
 ```toml
 [params]
-  background = "#ccc"
+  background = "#fff"
   backgroundImage = "/me/background.jpg"
   linkColor = "seagreen"
 
   # dark mode
-  defaultDark = true
+  # defaultDark = true
   backgroundDark = "black"
   backgroundImageDark = "/me/background-dark.jpg"
   darkLinkColor = "darkseagreen"
-  darkNav = true
-  dark404 = true
+  # darkNav = true
+  # dark404 = true
 
   images = [""]
 
@@ -23,8 +23,10 @@
   avatar = "/me/yy.jpg"
   headerTitle = "g1eny0ung 的博客"
   motto = "与其感慨路难行，不如马上出发。"
-  categoriesLimitInHeader = 6
-  # headerBottomText = ""
+  # categoriesLimitInHeader = 6 # deprecated
+  # headerBottomText = "" # deprecated
+
+  # footerBottomText = ""
 
   rss = true
 
@@ -152,12 +154,22 @@ Used in Header.
 
 ### `categoriesLimitInHeader = 6`
 
+> Deprecated. Only available before `v2.0.0`
+
 Limit the number of categories displayed in the header, the default is **6**.
 
 ### `# headerBottomText = ""`
 
+> Deprecated. Only available before `v2.0.0`
+
 Add text at the bottom of the header, support html. This is usually used as a description of the website information.
 
+### `# footerBottomText = ""`
+
+> Only available after `v2.0.0`
+
+Add text at the bottom of the footer, support html. This is usually used as a description of the website information.
+
 ### `rss = true`
 
 Enable RSS.

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -13,7 +13,7 @@ theme = "hugo-theme-dream"
 # enableRobotsTXT = true
 
 [params]
-  background = "black"
+  background = "#f7f7f7"
   # backgroundImage = "/me/background.jpg"
   linkColor = "seagreen"
 
@@ -22,16 +22,18 @@ theme = "hugo-theme-dream"
   # backgroundDark = "black"
   # backgroundImageDark = "/me/background-dark.jpg"
   # darkLinkColor = "darkseagreen"
-  darkNav = true
-  dark404 = true
+  # darkNav = true
+  # dark404 = true
 
   author = "Yue Yang"
   # description = ""
   avatar = "/img/avatar.jpg"
   # headerTitle = ""
   motto = "Motto"
-  # categoriesLimitInHeader = 6
-  # headerBottomText = ""
+  # categoriesLimitInHeader = 6 # deprecated
+  # headerBottomText = "" # deprecated
+
+  # footerBottomText = ""
 
   # rss = true
 

diff --git a/images/screenshot.png b/images/screenshot.png
diff --git a/images/tn.png b/images/tn.png
diff --git a/layouts/404.html b/layouts/404.html
@@ -9,11 +9,11 @@ <h1 class="ui header">
         <div class="sub header">Don't worry though, click the button below to wake up.</div>
       </h1>
       <p>
-        <button class="ui button" onclick="window.location.href = '/'">{{ i18n "backToHome" }}</button>
+        <button class="ui secondary button" onclick="window.location.href = '/'">{{ i18n "backToHome" }}</button>
       </p>
     {{ else if .Site.Params.dark404 }}
       <h1 class="ui inverted header">
-        Oops ... You are lost in dream.
+        Oops...You are lost in dream.
         <div class="sub header">Don't worry though, click the button below to wake up.</div>
       </h1>
       <p>
@@ -25,7 +25,7 @@ <h1 class="ui header">
         <div class="sub header">Don't worry though, click the button below to wake up.</div>
       </h1>
       <p>
-        <button class="ui button" onclick="window.location.href = '/'">{{ i18n "backToHome" }}</button>
+        <button class="ui secondary button" onclick="window.location.href = '/'">{{ i18n "backToHome" }}</button>
       </p>
     {{ end }}
   </div>

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -7,10 +7,12 @@
     <title>{{ block "title" . }} {{- T "home" -}} {{ end }} | {{ .Site.Title }}</title>
 
     {{ partial "head.html" . }}
+
     {{ block "css" . }} {{ end }}
-    {{ range .Site.Params.Advanced.customCSS -}}
-      <link rel="stylesheet" href="{{ . | relURL }}" />
-    {{- end }}
+
+    {{ range .Site.Params.Advanced.customCSS }}
+    <link rel="stylesheet" href="{{ . | relURL }}" />
+    {{ end }}
   </head>
 
   <body class="default">
@@ -20,6 +22,20 @@
         <section class="front">
           <div class="dream-max-width">
             {{ block "main" . }} {{ end }}
+
+            <footer class="ui basic center aligned segment" style="background-color: transparent;">
+              {{ if .Site.Params.siteStartYear }}
+              <p>© {{ if eq now.Year .Site.Params.siteStartYear }}{{ now.Year }}{{ else }}{{ .Site.Params.siteStartYear }} - {{ now.Year }}{{ end }} {{ .Site.Title }}</p>
+              {{ else }}
+              <p>© {{ now.Year }} {{ .Site.Title }}</p>
+              {{ end }}
+
+              <p>Powered by <a href="https://gohugo.io/" target="_blank">Hugo</a> with theme <a href="https://github.com/g1eny0ung/hugo-theme-dream" target="_blank">Dream</a>.</p>
+
+              {{ if .Site.Params.footerBottomText }}
+              <p>{{ .Site.Params.footerBottomText | safeHTML }}</p>
+              {{ end }}
+            </footer>
           </div>
         </section>
         <section class="back">
@@ -34,15 +50,15 @@
     {{ block "js" . }} {{ end }}
 
     {{ if .Site.Params.enableSearch }}
-      {{ partial "search.html" . }}
+    {{ partial "search.html" . }}
     {{ end }}
 
-    {{ range .Site.Params.Advanced.customJS -}}
-      <script src="{{ . | relURL }}"></script>
-    {{- end }}
+    {{ range .Site.Params.Advanced.customJS }}
+    <script src="{{ . | relURL }}"></script>
+    {{ end }}
 
     {{ if .Site.GoogleAnalytics }}
-      {{ template "_internal/google_analytics_async.html" . }}
+    {{ template "_internal/google_analytics_async.html" . }}
     {{ end }}
   </body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,25 +1,26 @@
 {{ define "title" }}
 {{- if or (eq .Data.Singular "tag") (eq .Data.Singular "category") -}}
-  {{ .Data.Term }}
+{{ .Data.Term }}
 {{- end -}}
 {{ end }}
 
 {{ define "main"}}
-<div class="ui centered relaxed grid dream-grid">
-  <div class="sixteen wide mobile eight wide tablet eight wide computer four wide large screen four wide widescreen column dream-column">
-    {{ partial "header.html" . }}
-  </div>
 
+{{ partial "header.html" . }}
+
+<div class="ui relaxed grid dream-grid">
   {{ $paginator := .Paginate .Pages }}
   {{ range $paginator.Pages }}
-    <div class="sixteen wide mobile eight wide tablet eight wide computer four wide large screen four wide widescreen column dream-column">
-      {{ .Render "summary" }}
-    </div>
+  <div class="sixteen wide mobile eight wide tablet eight wide computer four wide large screen four wide widescreen column dream-column">
+    {{ .Render "summary" }}
+  </div>
   {{ end }}
 
+  {{ if or $paginator.HasPrev $paginator.HasNext  }}
   <div class="sixteen wide mobile eight wide tablet eight wide computer four wide large screen four wide widescreen column dream-column">
-    {{ partial "paginator.html" (dict "paginator" $paginator "Site" .Site) }}
+    {{ partial "paginator.html" (dict "paginator" $paginator) }}
   </div>
+  {{ end }}
 </div>
 {{ end }}