diff options
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | assets/css/eureka.css (renamed from assets/css/styles.css) | 0 | ||||
-rw-r--r-- | assets/css/site.css | 4 | ||||
-rw-r--r-- | exampleSite/config/_default/config.toml | 2 | ||||
-rw-r--r-- | exampleSite/content/authors/_index.md | 95 | ||||
-rw-r--r-- | layouts/_default/list.html | 14 | ||||
-rw-r--r-- | layouts/_default/section.html | 2 | ||||
-rw-r--r-- | layouts/_default/single.html | 2 | ||||
-rw-r--r-- | layouts/_default/terms.html | 19 | ||||
-rw-r--r-- | layouts/authors/list.html | 2 | ||||
-rw-r--r-- | layouts/authors/terms.html | 19 | ||||
-rw-r--r-- | layouts/partials/featured_image.html | 6 | ||||
-rw-r--r-- | layouts/partials/head.html | 8 | ||||
-rw-r--r-- | layouts/partials/horizontal_summary.html | 2 | ||||
-rw-r--r-- | layouts/partials/stacked_summary.html | 4 | ||||
-rw-r--r-- | layouts/post/single.html | 2 |
16 files changed, 61 insertions, 124 deletions
@@ -45,4 +45,6 @@ For more usage, please refer to Hugo's [basic usage](https://gohugo.io/getting-s ## License -[MIT](https://github.com/wangchucheng/hugo-eureka/blob/master/LICENSE)
\ No newline at end of file +This project is licensed under a [MIT License](https://github.com/wangchucheng/hugo-eureka/blob/master/LICENSE). + +The sample photos in the project are taken by me and licensed under a [CC BY-NC-SA 4.0 License](https://creativecommons.org/licenses/by-nc-sa/4.0/).
\ No newline at end of file diff --git a/assets/css/styles.css b/assets/css/eureka.css index 9531157..9531157 100644 --- a/assets/css/styles.css +++ b/assets/css/eureka.css diff --git a/assets/css/site.css b/assets/css/site.css index da53d46..bc6a844 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -1,7 +1,3 @@ -.starter { - color: blue; -} - .sticky-toc { @apply sticky z-0 ease-in-out duration-300; top: 8rem; diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/config.toml index 937ab6e..038c5a8 100644 --- a/exampleSite/config/_default/config.toml +++ b/exampleSite/config/_default/config.toml @@ -25,4 +25,4 @@ defaultContentLanguageInSubdir = false category = "categories" tag = "tags" series = "series" - authors = "authors"
\ No newline at end of file + author = "authors"
\ No newline at end of file diff --git a/exampleSite/content/authors/_index.md b/exampleSite/content/authors/_index.md deleted file mode 100644 index 54f6ef4..0000000 --- a/exampleSite/content/authors/_index.md +++ /dev/null @@ -1,95 +0,0 @@ ---- -# Display name -title: Ma Lechi - -# Username (this should match the folder name) -authors: - - admin - -# Is this the primary user of the site? -superuser: true - -# Role/position -role: 学生 - -# Organizations/Affiliations -organizations: - - name: 武汉大学 - url: "https://www.whu.edu.cn/" - -# Short bio (displayed in user profile at end of posts) -bio: 有梦想,有追求,有吃的,有喝的,有玩的,有爱的 - -shortContent: 奔波在实现梦想的道路上,享受忙碌的同时也喜欢惬意地驻足留意身边的美景,拥有许多大梦想。也有许多小愿望。 - -interests: - - 看好看的 - - 吃好吃的 - - 玩好玩的 - -education: - - institution: 武汉大学 计算机学院 - course: 软件工程 - year: 2017-2021 - - institution: 华中师大一附中 - course: 普通高中 - year: 2014-2017 - -honor: - - 某奖一等奖 - - 某奖二等奖 - -# Social/Academic Networking -# For available icons, see: https://sourcethemes.com/academic/docs/page-builder/#icons -# For an email link, use "fas" icon pack, "envelope" icon, and a link in the -# form "mailto:your-email@example.com" or "#contact" for contact widget. -social: - - icon: envelope - icon_pack: fas - link: "mailto:happy.malechi@gmail" # For a direct email link, use "mailto:test@example.org". - - icon: twitter - icon_pack: fab - link: https://https://twitter.com/malechi20 - - icon: github - icon_pack: fab - link: https://github.com/malechiMLC -# Link to a PDF of your resume/CV from the About widget. -# To enable, copy your resume/CV to `static/files/cv.pdf` and uncomment the lines below. -# - icon: cv -# icon_pack: ai -# link: files/cv.pdf - -# Enter email to display Gravatar (if Gravatar enabled in Config) -email: "" -# Organizational groups that you belong to (for People widget) -# Set this to `[]` or comment out if you are not using People widget. -# user_groups: -# - Researchers -# - Visitors ---- -## 自我介绍 - -我是一个多学科的设计师,住在布加勒斯特和我的妻子和一只懒洋洋的猫。 -我工作时做的事情:视觉识别(标识、社交媒体展示),网页设计(电子商务、演示文稿、登录页),印刷设计(所有东西文具、营销材料、包装),动画和插图。 - -我的风格可以说是干净清晰,积极和注重内容。 - -对于一般工作,我使用Adobe产品,主要是插画,Photoshop和后期效果。用于应用程序设计和原型,Figma。 -我的爱好包括传统绘画,创造性的产品设计和几乎任何我可以重塑或绘画,你可以在这里看到一些样品。 - -## 详细资料 - -年龄: 23岁 -职业:设计师 -喜爱: 狗,旅行,美食,生活 - -感兴趣的事: -- 做出大家吃了觉得幸福的美食 -- 上网看狗狗的照片 -- 发呆 - -去过的城市: -- 这个城市 -- 那个城市 -- 未来要去的那个城市 -- 以前去过的那个城市 diff --git a/layouts/_default/list.html b/layouts/_default/list.html index dfa94f0..9a3abfa 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,13 +7,13 @@ </div> {{ end }} </article> -<div class="bg-secondary-bg rounded px-6 py-8"> - {{ range .Pages }} - <h2 class="text-lg text-primary-text my-2"> - <a href="{{ .Permalink }}" class="text-eureka hover:underline"> - {{ .Title }} - </a> - </h2> +<div class="bg-secondary-bg rounded overflow-hidden px-4 divide-y"> + {{ range .Paginator.Pages }} + + <div class="px-2 py-6"> + {{ partial "horizontal_summary.html" . }} + </div> {{ end }} </div> +{{ template "_internal/pagination.html" . }} {{ end }}
\ No newline at end of file diff --git a/layouts/_default/section.html b/layouts/_default/section.html index fc9cbf5..9a3abfa 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -14,8 +14,6 @@ {{ partial "horizontal_summary.html" . }} </div> {{ end }} - - </div> {{ template "_internal/pagination.html" . }} {{ end }}
\ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 92838bc..d880f84 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,7 +6,7 @@ class="col-span-2 {{ if not $hasSidebar }} {{- print "lg:col-start-2" -}} {{ end }} lg:col-span-6 bg-secondary-bg rounded px-6 py-8"> <h1 class="font-bold text-3xl text-primary-text">{{ .Title }}</h1> {{ partial "post_metadata.html" . }} - <div class="object-cover w-full my-4"> + <div class="my-4"> {{ partial "featured_image.html" . }} </div> <div class="content"> diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html new file mode 100644 index 0000000..dfa94f0 --- /dev/null +++ b/layouts/_default/terms.html @@ -0,0 +1,19 @@ +{{ define "main" }} +<article class="mx-6 mb-8"> + <h1 class="font-bold text-3xl text-primary-text">{{.Title}}</h1> + {{ with .Content }} + <div class="content"> + {{ . }} + </div> + {{ end }} +</article> +<div class="bg-secondary-bg rounded px-6 py-8"> + {{ range .Pages }} + <h2 class="text-lg text-primary-text my-2"> + <a href="{{ .Permalink }}" class="text-eureka hover:underline"> + {{ .Title }} + </a> + </h2> + {{ end }} +</div> +{{ end }}
\ No newline at end of file diff --git a/layouts/authors/list.html b/layouts/authors/list.html index 21b8cb1..d83992f 100644 --- a/layouts/authors/list.html +++ b/layouts/authors/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -<div class="bg-secondary-bg primary-text"> +<div class="bg-secondary-bg rounded primary-text"> {{ partial "widgets/about.html" . }} {{ partial "widgets/details.html" . }} </div> diff --git a/layouts/authors/terms.html b/layouts/authors/terms.html new file mode 100644 index 0000000..dfa94f0 --- /dev/null +++ b/layouts/authors/terms.html @@ -0,0 +1,19 @@ +{{ define "main" }} +<article class="mx-6 mb-8"> + <h1 class="font-bold text-3xl text-primary-text">{{.Title}}</h1> + {{ with .Content }} + <div class="content"> + {{ . }} + </div> + {{ end }} +</article> +<div class="bg-secondary-bg rounded px-6 py-8"> + {{ range .Pages }} + <h2 class="text-lg text-primary-text my-2"> + <a href="{{ .Permalink }}" class="text-eureka hover:underline"> + {{ .Title }} + </a> + </h2> + {{ end }} +</div> +{{ end }}
\ No newline at end of file diff --git a/layouts/partials/featured_image.html b/layouts/partials/featured_image.html index 4866b93..68e457d 100644 --- a/layouts/partials/featured_image.html +++ b/layouts/partials/featured_image.html @@ -1,13 +1,13 @@ {{ $img := (.Resources.ByType "image").GetMatch "*featured*" }} {{ with $img }} -<img src="{{ .RelPermalink }}" alt="Featured Image"> +<img src="{{ .RelPermalink }}" class="w-full" alt="Featured Image"> {{ end }} {{ if .Params.featuredImage }} -{{ if hasPrefix .Params.featuredImage "http" }} +{{ if or (hasPrefix .Params.featuredImage "http://") (hasPrefix .Params.featuredImage "https://") }} {{ $img = .Params.featuredImage }} {{ else }} {{ $imgPath := path.Join "img" .Params.featuredImage }} {{ $img = $imgPath | relURL }} {{ end }} -<img src="{{- $img -}}" alt="Featured Image"> +<img src="{{- $img -}}" class="w-full" alt="Featured Image"> {{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 2577a13..570a8a1 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -3,12 +3,12 @@ <title>{{ with .Params.Title }}{{ . }} | {{ end }}{{ .Site.Title }}</title> {{ hugo.Generator }} -{{ $styles := resources.Get "css/styles.css" | postCSS (dict "config" "./assets/css/postcss.config.js") }} +{{ $eureka_css := resources.Get "css/eureka.css" | postCSS (dict "config" "./assets/css/postcss.config.js") }} {{ if .Site.IsServer }} -<link rel="stylesheet" href="{{ $styles.RelPermalink }}"> +<link rel="stylesheet" href="{{ $eureka_css.RelPermalink }}"> {{ else }} -{{ $styles := $styles| minify | fingerprint | resources.PostProcess }} -<link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}"> +{{ $eureka_css := $eureka_css| minify | fingerprint | resources.PostProcess }} +<link rel="stylesheet" href="{{ $eureka_css.Permalink }}" integrity="{{ $eureka_css.Data.Integrity }}"> {{ end }} {{ $eureka_js := resources.Get "js/eureka.js" }} <script async src="{{ $eureka_js.RelPermalink }}"></script> diff --git a/layouts/partials/horizontal_summary.html b/layouts/partials/horizontal_summary.html index a1677c1..b0c2ee5 100644 --- a/layouts/partials/horizontal_summary.html +++ b/layouts/partials/horizontal_summary.html @@ -9,7 +9,7 @@ </div> {{ partial "post_metadata.html" . }} </div> - <div class="lg:max-w-xs object-contain mb-4 lg:mb-0 lg:ml-8"> + <div class="lg:max-w-xs mb-4 lg:mb-0 lg:ml-8"> {{ partial "featured_image.html" . }} </div> </div>
\ No newline at end of file diff --git a/layouts/partials/stacked_summary.html b/layouts/partials/stacked_summary.html index 64455f5..9ace272 100644 --- a/layouts/partials/stacked_summary.html +++ b/layouts/partials/stacked_summary.html @@ -1,7 +1,5 @@ <div class="bg-secondary-bg rounded overflow-hidden hover:shadow-lg transition ease-in-out duration-200"> - <div class="w-full"> - {{ partial "featured_image.html" . }} - </div> + {{ partial "featured_image.html" . }} <div class="px-6 pt-6"> <div class="font-bold text-xl text-primary-text mb-2"><a href="{{ .Permalink }}" class="hover:text-eureka">{{ .Title }}</a></div> <div class=""> diff --git a/layouts/post/single.html b/layouts/post/single.html index c84e6ea..befd663 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -6,7 +6,7 @@ class="col-span-2 {{ if not $hasSidebar }} {{- print "lg:col-start-2" -}} {{ end }} lg:col-span-6 bg-secondary-bg rounded px-6 py-8"> <h1 class="font-bold text-3xl text-primary-text">{{ .Title }}</h1> {{ partial "post_metadata.html" . }} - <div class="object-cover w-full my-4"> + <div class="my-4"> {{ partial "featured_image.html" . }} </div> <div class="content"> |