Browse Source

css fix, featuredImage shortcode, edit-this-page bug fix, exampleSite update

zzossig 5 years ago
parent
commit
8bfeed9247

+ 2 - 1
archetypes/default.md

@@ -1,8 +1,9 @@
 ---
 ---
 title: "{{ replace .Name "-" " " | title }}"
 title: "{{ replace .Name "-" " " | title }}"
+description: ""
 date: {{ .Date }}
 date: {{ .Date }}
 draft: false
 draft: false
 weight: 0
 weight: 0
 enableToc: true
 enableToc: true
 tocLevels: ["h2", "h3", "h4"]
 tocLevels: ["h2", "h3", "h4"]
----
+---

+ 13 - 0
archetypes/post.md

@@ -0,0 +1,13 @@
+---
+author: "Hugo Authors"
+title: "{{ replace .Name "-" " " | title }}"
+description: ""
+date: {{ .Date }}
+draft: false
+weight: 0
+tags:
+- 
+image: "" # relative path to the static folder. The image is in the root/static/images folder.
+enableToc: true
+tocLevels: ["h2", "h3", "h4"]
+---

+ 8 - 0
archetypes/section.md

@@ -0,0 +1,8 @@
+---
+title: "{{ replace .Name "-" " " | title }}"
+description: ""
+date: {{ .Date }}
+draft: false
+weight: 0
+collapsible: true
+---

+ 3 - 3
assets/sass/components/_codetab.scss

@@ -3,9 +3,9 @@
 
 
   &__links {
   &__links {
     position: absolute;
     position: absolute;
-    top: 0;
+    top: 2px;
     left: 0;
     left: 0;
-    height: 27px;
+    height: 26px;
     z-index: z('clipboard');
     z-index: z('clipboard');
     border-top-left-radius: 0.25rem;
     border-top-left-radius: 0.25rem;
 
 
@@ -18,7 +18,7 @@
   }
   }
 
 
   &__link {
   &__link {
-    height: 27px;
+    height: 26px;
     border: none;
     border: none;
     outline: none;
     outline: none;
     cursor: pointer;
     cursor: pointer;

+ 13 - 0
assets/sass/components/_featuredImage.scss

@@ -0,0 +1,13 @@
+.featured-image {
+  width: 100%;
+  object-fit: cover;
+
+  &--wrapper {
+    width: 100%;
+    height: 100%;
+
+    @include flexbox();
+    @include align-items(center);
+    @include justify-content(center);
+  }
+}

+ 1 - 1
assets/sass/components/_notice.scss

@@ -18,7 +18,7 @@
     }
     }
 
 
     &.warning {
     &.warning {
-        border-top: 30px solid #ffca28;
+        border-top: 30px solid #ffd54f;
         background: #fefaf5;
         background: #fefaf5;
         color: #161209;
         color: #161209;
 
 

+ 3 - 3
assets/sass/components/_toc.scss

@@ -2,8 +2,8 @@
   position: -webkit-sticky;
   position: -webkit-sticky;
   position: sticky;
   position: sticky;
   top: $grid-nav-height;
   top: $grid-nav-height;
-  padding: 0.25rem;
-  margin: 0.25rem;
+  padding: 0.5rem;
+  margin: 0 0.5rem;
   margin-top: 0;
   margin-top: 0;
   padding-top: 1.25rem;
   padding-top: 1.25rem;
   height: calc(100vh - $grid-nav-height);
   height: calc(100vh - $grid-nav-height);
@@ -66,7 +66,7 @@
   ul {
   ul {
     li {
     li {
       li {
       li {
-        margin-left: 0.6rem;
+        margin-left: 0.5rem;
       }
       }
     }
     }
   }
   }

+ 1 - 1
assets/sass/layout/_grid.scss

@@ -56,7 +56,7 @@
 
 
 .sv { // single view
 .sv { // single view
     display: grid;
     display: grid;
-    grid-template-columns: minmax(630px, 1fr) minmax(125px, 325px);
+    grid-template-columns: minmax(630px, 960px) minmax(125px, 325px);
     grid-template-rows: 1fr;
     grid-template-rows: 1fr;
     grid-column-gap: 0px;
     grid-column-gap: 0px;
     grid-row-gap: 0px;
     grid-row-gap: 0px;

+ 1 - 0
assets/sass/main.scss

@@ -52,6 +52,7 @@ $light-nav-icon-color: {{ .Site.Data.color.light_nav_icon_color }};
 @import 'components/tab';
 @import 'components/tab';
 @import 'components/codetab';
 @import 'components/codetab';
 @import 'components/box';
 @import 'components/box';
+@import 'components/featuredImage';
 
 
 @import 'layout/grid';
 @import 'layout/grid';
 @import 'layout/footer';
 @import 'layout/footer';

+ 1 - 1
exampleSite/config/_default/params.toml

@@ -30,7 +30,7 @@ taxoGroupByDate = "2006" # "2006-01": group by month, "2006": group by year
 github = "https://github.com/zzossig/hugo-theme-zdoc"
 github = "https://github.com/zzossig/hugo-theme-zdoc"
 
 
 # comment
 # comment
-enableComment = true
+enableComment = false
 disqus_shortname = ""
 disqus_shortname = ""
 commento = false
 commento = false
 
 

+ 17 - 10
exampleSite/content/en/blog/_index.md

@@ -1,33 +1,40 @@
 ---
 ---
 title: Blog
 title: Blog
 description: Blog list page
 description: Blog list page
-blogHeaderType: text
-headerHeight: 112
+blogHeaderType: img
 header:
 header:
   - type: text
   - type: text
+    height: 200
     paddingX: 50
     paddingX: 50
-    paddingY: 0
     align: center
     align: center
     title:
     title:
       - Blog
       - Blog
-    subtitle:
+    subtitle: 
       - 
       - 
-    spaceBetweenTitleSubtitle: 0
+      - 
+    titleColor: 
+    titleFontSize: 44
+    subtitleColor: 
+    subtitleFontSize: 20
+    spaceBetweenTitleSubtitle: 16
   
   
   - type: img
   - type: img
-    imageSrc: images/header/background.png
-    imageSize: initial
+    imageSrc: images/header/background.jpg
+    imageSize: cover
     imageRepeat: no-repeat
     imageRepeat: no-repeat
     imagePosition: center
     imagePosition: center
-    height: 170
+    height: 370
     paddingX: 50
     paddingX: 50
     paddingY: 0
     paddingY: 0
     align: center
     align: center
     title:
     title:
-      - 
+      - Zzo blog
     subtitle:
     subtitle:
       - 
       - 
+    titleColor: 
     titleShadow: true
     titleShadow: true
-    subtitleCursive: true
+    titleFontSize: 44
+    subtitleColor:
+    subtitleFontSize: 16
     spaceBetweenTitleSubtitle: 20
     spaceBetweenTitleSubtitle: 20
 ---
 ---

+ 1 - 7
exampleSite/content/en/blog/emoji-support.md

@@ -2,18 +2,12 @@
 author = "Hugo Authors"
 author = "Hugo Authors"
 title = "Emoji Support"
 title = "Emoji Support"
 date = "2019-03-05"
 date = "2019-03-05"
-# description = "Guide to emoji usage in Hugo"
+description = "Guide to emoji usage in Hugo"
 tags = [
 tags = [
     "emoji",
     "emoji",
 ]
 ]
-image = "images/mountains.jpg"
 +++
 +++
 
 
-Lorem est tota propiore conpellat pectoribus de
-pectora summo. Redit teque digerit hominumque toris verebor lumina non cervice
-subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc
-caluere tempus<!--more-->
-
 Emoji can be enabled in a Hugo project in a number of ways. 
 Emoji can be enabled in a Hugo project in a number of ways. 
 <!--more-->
 <!--more-->
 The [`emojify`](https://gohugo.io/functions/emojify/) function can be called directly in templates or [Inline Shortcodes](https://gohugo.io/templates/shortcode-templates/#inline-shortcodes). 
 The [`emojify`](https://gohugo.io/functions/emojify/) function can be called directly in templates or [Inline Shortcodes](https://gohugo.io/templates/shortcode-templates/#inline-shortcodes). 

+ 5 - 13
exampleSite/content/en/blog/markdown-syntax.md

@@ -2,24 +2,16 @@
 author = "Hugo Authors"
 author = "Hugo Authors"
 title = "Markdown Syntax Guide"
 title = "Markdown Syntax Guide"
 date = "2019-03-11"
 date = "2019-03-11"
-# description = "Sample article showcasing basic Markdown syntax and formatting for HTML elements."
+description = "Sample article showcasing basic Markdown syntax and formatting for HTML elements."
 tags = [
 tags = [
     "markdown",
     "markdown",
     "css",
     "css",
     "html",
     "html",
     "themes",
     "themes",
 ]
 ]
-categories = [
-    "themes",
-    "syntax",
-]
-series = ["Themes Guide"]
-+++
+tocLevels = ["h2", "h3", "h4", "h5"]
 
 
-Lorem est tota propiore conpellat pectoribus de
-pectora summo. Redit teque digerit hominumque toris verebor lumina non cervice
-subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc
-caluere tempus<!--more-->
++++
 
 
 This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme.
 This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme.
 <!--more-->
 <!--more-->
@@ -45,12 +37,12 @@ Itatur? Quiatae cullecum rem ent aut odis in re eossequodi nonsequ idebis ne sap
 
 
 The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations.
 The blockquote element represents content that is quoted from another source, optionally with a citation which must be within a `footer` or `cite` element, and optionally with in-line changes such as annotations and abbreviations.
 
 
-#### Blockquote without attribution
+### Blockquote without attribution
 
 
 > Tiam, ad mint andaepu dandae nostion secatur sequo quae.
 > Tiam, ad mint andaepu dandae nostion secatur sequo quae.
 > **Note** that you can use *Markdown syntax* within a blockquote.
 > **Note** that you can use *Markdown syntax* within a blockquote.
 
 
-#### Blockquote with attribution
+### Blockquote with attribution
 
 
 > Don't communicate by sharing memory, share memory by communicating.</p>
 > Don't communicate by sharing memory, share memory by communicating.</p>
 > — <cite>Rob Pike[^1]</cite>
 > — <cite>Rob Pike[^1]</cite>

+ 3 - 4
exampleSite/content/en/blog/placeholder-text.md

@@ -2,18 +2,17 @@
 author = "Hugo Authors"
 author = "Hugo Authors"
 title = "Placeholder Text"
 title = "Placeholder Text"
 date = "2019-03-09"
 date = "2019-03-09"
-#description = "Lorem Ipsum Dolor Si Amet"
+description = "Lorem Ipsum Dolor Si Amet"
 tags = [
 tags = [
     "markdown",
     "markdown",
     "text",
     "text",
 ]
 ]
-image = "images/landscape.jpg"
 +++
 +++
 
 
 Lorem est tota propiore conpellat pectoribus de
 Lorem est tota propiore conpellat pectoribus de
-pectora summo. Redit teque digerit hominumque toris verebor lumina non cervice
+pectora summo. <!--more-->Redit teque digerit hominumque toris verebor lumina non cervice
 subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc
 subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc
-caluere tempus<!--more--> inhospita parcite confusaque translucet patri vestro qui optatis
+caluere tempus inhospita parcite confusaque translucet patri vestro qui optatis
 lumine cognoscere flos nubis! Fronde ipsamque patulos Dryopen deorum.
 lumine cognoscere flos nubis! Fronde ipsamque patulos Dryopen deorum.
 
 
 1. Exierant elisi ambit vivere dedere
 1. Exierant elisi ambit vivere dedere

+ 2 - 5
exampleSite/content/en/blog/rich-content.md

@@ -2,7 +2,7 @@
 author = "Hugo Authors"
 author = "Hugo Authors"
 title = "Rich Content"
 title = "Rich Content"
 date = "2019-03-10"
 date = "2019-03-10"
-# description = "A brief description of Hugo Shortcodes"
+description = "A brief description of Hugo Shortcodes"
 tags = [
 tags = [
     "shortcodes",
     "shortcodes",
     "privacy",
     "privacy",
@@ -10,10 +10,7 @@ tags = [
 image = "images/mountain.jpg"
 image = "images/mountain.jpg"
 +++
 +++
 
 
-Lorem est tota propiore conpellat pectoribus de
-pectora summo. Redit teque digerit hominumque toris verebor lumina non cervice
-subde tollit usus habet Arctonque, furores quas nec ferunt. Quoque montibus nunc
-caluere tempus<!--more-->
+{{< featuredImage >}}
 
 
 Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-management/shortcodes/#use-hugo-s-built-in-shortcodes) for rich content, along with a [Privacy Config](https://gohugo.io/about/hugo-and-gdpr/) and a set of Simple Shortcodes that enable static and no-JS versions of various social media embeds.
 Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-management/shortcodes/#use-hugo-s-built-in-shortcodes) for rich content, along with a [Privacy Config](https://gohugo.io/about/hugo-and-gdpr/) and a set of Simple Shortcodes that enable static and no-JS versions of various social media embeds.
 <!--more-->
 <!--more-->

File diff suppressed because it is too large
+ 0 - 0
exampleSite/resources/_gen/assets/scss/sass/main.scss_b4f67ac5085b89b62b54c1923e5a9145.content


+ 1 - 1
layouts/_default/single.html

@@ -1,5 +1,5 @@
 {{ define "header" }}
 {{ define "header" }}
- {{ partial "main/header.html" . }}
+  {{ partial "main/header.html" . }}
 {{ end }}
 {{ end }}
 {{ define "main" }}
 {{ define "main" }}
   {{ partial "main/single.html" . }}
   {{ partial "main/single.html" . }}

+ 8 - 5
layouts/partials/main/component/edit-this-page.html

@@ -1,7 +1,10 @@
 {{ if $.Param "enableEditBtn" }}
 {{ if $.Param "enableEditBtn" }}
-  <a href="{{ $.Param "editBaseURL" }}{{ strings.TrimSuffix "/" (.Permalink | relLangURL) }}.md" target="_blank" rel="noreferrer">
-    <button class="editBtn" aria-label="Edit This Page Button">
-      {{ i18n "edit-this-page" | default "EDIT THIS PAGE" }}
-    </button>
-  </a>
+  {{ $root := .}}
+  {{ with .FirstSection }}
+    <a href="{{ .Params.editBaseURL | default ($.Param "editBaseURL") }}{{ strings.TrimSuffix "/" ($root.Permalink | relLangURL) }}.md" target="_blank" rel="noreferrer">
+      <button class="editBtn" aria-label="Edit This Page Button">
+        {{ i18n "edit-this-page" | default "EDIT THIS PAGE" }}
+      </button>
+    </a>
+  {{ end }}
 {{ end }}
 {{ end }}

+ 14 - 0
layouts/shortcodes/featuredImage.html

@@ -0,0 +1,14 @@
+{{ $imgSrc := false }}
+{{ $params := $.Page.Params }}
+
+{{ if $params.image }}
+  {{ $imgSrc = $params.image }}
+{{ else if $params.featured_image }}
+  {{ $imgSrc = (print "images/" $params.featured_image) }}
+{{ end }}
+
+{{ if $imgSrc }}
+  <div class="featured-image__wrapper">
+    <img src="{{ $imgSrc | relURL }}" alt="{{ (.Get "alt") | default "Featured Image" }}" class="featured-image" style="width: {{ with (.Get "width") }}{{ . }}px{{ end }};height: {{ with (.Get "height") }}{{ . }}px{{ end }};">
+  </div>
+{{ end }}

Some files were not shown because too many files changed in this diff