Browse Source
Squashed 'themes/hugo-cactus-theme/' changes from 3c9b7fb..0445e9f
0445e9f Release v1.1.1 4a677d1 Fix links to commits in CHANGELOG aae9109 Add CSS fix for ordered lists to be numbered 534de94 Update default template to follow new Hugo customs ee75dde Include subtitles on single pages 45aa974 Widen the center column 5108c87 Use CDN for fontawesome 399dbd5 Merge branch 'dev' da71c66 Update CHANGELOG dd00089 Remove hidden feature description from README adc1a9f Remove hidden feature description from README 963d9ac Set default values for configurable strings 1b6b863 Improve content lists templates dd67ac4 Add support for main menu a49024e Remove unused vars from frontmatter of sample content c618828 Deprecate params.about and adjust sample texts f37f79a Bump required Hugo version to v0.19 c2b7256 Improve linking in default single.html template 9b358a9 Switch to block templates d8bf949 Show only regular pages on homepage b85883b Set default language code in head partial fa3c87d Replace .Now with now due to deprecation 931eb53 Improve URL generation 34f8cf2 Fix display issue of about page a3fe33d Set min version to v0.20 ef185e1 Replace deprecated .Now with now template func git-subtree-dir: themes/hugo-cactus-theme git-subtree-split: 0445e9fad685baf43f9c7bc74008cee913c31252master
27 changed files with 205 additions and 214 deletions
Unified View
Diff Options
-
+41 -9CHANGELOG.md
-
+2 -6README.md
-
+5 -4archetypes/default.md
-
+2 -3exampleSite/config.toml
-
+2 -1exampleSite/content/about/_index.md
-
+0 -6exampleSite/content/post/creating-a-new-theme.md
-
+0 -1exampleSite/content/post/goisforlovers.md
-
+0 -1exampleSite/content/post/hugoisforlovers.md
-
+0 -5exampleSite/content/post/migrate-from-jekyll.md
-
+9 -17layouts/404.html
-
+16 -0layouts/_default/baseof.html
-
+4 -11layouts/_default/list.html
-
+36 -43layouts/_default/single.html
-
+5 -0layouts/about/list.html
-
+0 -13layouts/about/single.html
-
+7 -14layouts/index.html
-
+1 -1layouts/partials/footer.html
-
+25 -29layouts/partials/head.html
-
+3 -3layouts/partials/js.html
-
+6 -8layouts/partials/latest-posts.html
-
+6 -7layouts/partials/nav.html
-
+3 -3layouts/partials/pagination.html
-
+6 -9layouts/partials/post-list.html
-
+3 -3layouts/partials/profile.html
-
+2 -2layouts/partials/share.html
-
+13 -7static/css/style.css
-
+8 -8theme.toml
+ 41
- 9
CHANGELOG.md
View File
| @ -1,39 +1,71 @@ | |||||
| # Changelog | # Changelog | ||||
| ### 2016/04/01 | |||||
| ## Release v1.1.1 - 04th September 2017 | |||||
| #### Fontawesome as option for social icons in footer | |||||
| - [6f818c5](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/6f818c506139debad3188d3bb027ca6808d9577d) Ordered lists are now styled | |||||
| - [9fb2a23](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/9fb2a23ab32fb61b62a77e9e8d590ab2cddb8201) adds support for subtitles in pages that can be defined with `.Description` in the front matter | |||||
| -[a0db308](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/a0db30812aafc89cde5a77d3189f3a028fabe5ba) widens the content column to improve the readability of code examples | |||||
| - [5108c87](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/5108c8787408d4d31a9161bb47cc506fd2d01fc6) loads FontAwesome from Bootstrap's CDN instead of using the local file. | |||||
| ## Release v1.1 - 26th April 2017 | |||||
| *In the future new additions and changes will be assigned to version numbers rather than dates.* This allows you to track changes in a better fashion. The state of this theme before this release has been assigned to v1.0. | |||||
| **Some changes and additions listed below require Hugo v0.20 or higher.** Consider to update Hugo to a newer as well if necessary. | |||||
| ### Fixes: | |||||
| [34f8cf2](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/34f8cf2)q fixes display issues of the about page that occured in Hugo v0.18 and higher due to the way how Hugo treats sites as a page of different kinds. **It's required to rename `content/about/index.md` to `content/about/_index.md`**. | |||||
| ### Improvements | |||||
| - [931eb53](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/931eb53) improves the generation URLs and linkage of pages | |||||
| - [9b358a9](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/9b358a9) uses block templates to reduce redundancy | |||||
| - [dd67ac4](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/dd67ac4) adds support for linking pages in the main menu | |||||
| ### Deprecations | |||||
| - [fa3c87d](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/fa3c87d) replaces .Now which was deprecated in Hugo v0.19 | |||||
| - [c618828](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/c618828) deprecates the `params.about` config option | |||||
| - [1b6b863](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/1b6b863) deprecates the option to hide single pages with the `hidden = true` front matter option. Use `draft = true` instead | |||||
| ## 4th January 2016 | |||||
| ### Fontawesome as option for social icons in footer | |||||
| You can now use Fontawesome as alternative to the Mono social icons. Look [here](https://github.com/digitalcraftsman/hugo-cactus-theme/tree/dev#social-link-icons) for more instructions. | You can now use Fontawesome as alternative to the Mono social icons. Look [here](https://github.com/digitalcraftsman/hugo-cactus-theme/tree/dev#social-link-icons) for more instructions. | ||||
| [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/79e5435d6be25ae882ab5ae8455f17834f109a32) | [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/79e5435d6be25ae882ab5ae8455f17834f109a32) | ||||
| #### Hide pages | |||||
| ### Hide pages | |||||
| Pages can now be hidden by adding `hidden = true` to the frontmatter. The pages are still built but they will not appear in the post in on the homepage. | Pages can now be hidden by adding `hidden = true` to the frontmatter. The pages are still built but they will not appear in the post in on the homepage. | ||||
| [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/cf93e42859280b04703cd6ca96062db9a4adb65e) | [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/cf93e42859280b04703cd6ca96062db9a4adb65e) | ||||
| ### 2015/07/12 | |||||
| ## 7th December 2015 | |||||
| #### Social link icons | |||||
| ### Social link icons | |||||
| Social links with icons can be enabled replacing the copyright field in footer. Configure the style and links in `config.toml`. | Social links with icons can be enabled replacing the copyright field in footer. Configure the style and links in `config.toml`. | ||||
| ### 2015/26/11 | |||||
| ## 26th November 2015 | |||||
| Hugo v0.15 is required in order to run the theme with the changes listed below: | Hugo v0.15 is required in order to run the theme with the changes listed below: | ||||
| #### Google Analytics | |||||
| ### Google Analytics | |||||
| The setup of Google Analytics changed slighty due to the switch to Hugo's built-in template. In order to update the theme you need to relocate the `google_analytics` variable in the configs and rename it to `googleAnalytics`. Take a look in the example [`config.toml`](https://github.com/digitalcraftsman/hugo-cactus-theme/blob/dev/exampleSite/config.toml). | The setup of Google Analytics changed slighty due to the switch to Hugo's built-in template. In order to update the theme you need to relocate the `google_analytics` variable in the configs and rename it to `googleAnalytics`. Take a look in the example [`config.toml`](https://github.com/digitalcraftsman/hugo-cactus-theme/blob/dev/exampleSite/config.toml). | ||||
| [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/c2cdd9a02a968738438c48d246ae3949a4e032fc) | [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/c2cdd9a02a968738438c48d246ae3949a4e032fc) | ||||
| #### Disqus | |||||
| ### Disqus | |||||
| Now the theme uses the built-in template of Hugo to enable the comments section with Disqus. This change requires to relocate the `disqusShortname` variable in the configs. | |||||
| Now the theme uses the built-in template of Hugo to enable the comments section with Disqus. This change requires to relocate the `disqusShortname` variable in the configs. | |||||
| [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/9ebf05f5b03b3a60fc11cc47775234b7fc2616f0) | [Show me the diff](https://github.com/digitalcraftsman/hugo-cactus-theme/commit/9ebf05f5b03b3a60fc11cc47775234b7fc2616f0) | ||||
+ 2
- 6
README.md
View File
+ 5
- 4
archetypes/default.md
View File
| @ -1,4 +1,5 @@ | |||||
| +++ | |||||
| title = "" | |||||
| description = "" | |||||
| +++ | |||||
| --- | |||||
| title: "{{ replace .TranslationBaseName "-" " " | title }}" | |||||
| date: {{ .Date }} | |||||
| draft: true | |||||
| --- | |||||
+ 2
- 3
exampleSite/config.toml
View File
exampleSite/content/about/index.md → exampleSite/content/about/_index.md
View File
+ 0
- 6
exampleSite/content/post/creating-a-new-theme.md
View File
+ 0
- 1
exampleSite/content/post/goisforlovers.md
View File
+ 0
- 1
exampleSite/content/post/hugoisforlovers.md
View File
+ 0
- 5
exampleSite/content/post/migrate-from-jekyll.md
View File
+ 9
- 17
layouts/404.html
View File
| @ -1,18 +1,10 @@ | |||||
| {{ partial "head.html" . }} | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| {{ define "main" }} | |||||
| <article class="post"> | |||||
| <header> | |||||
| <h1>{{ .Site.Params.title404 | default "404 - Page not found" }}</h1> | |||||
| <h3>{{ .Site.Params.subtitle404 | default "The content you're looking for doesn't seem to exist." }}</h3> | |||||
| </header> | |||||
| <section id="wrapper" class="home"> | |||||
| <article class="post"> | |||||
| <header> | |||||
| <h1>{{ with .Site.Params.title404 }}{{ . }}{{ else }}404 - Page not found{{ end }}</h1> | |||||
| <h3>{{ with .Site.Params.subtitle404 }}{{ . }}{{ else }}The content you're looking for doesn't seem to exist.{{ end }}</h3> | |||||
| </header> | |||||
| {{ partial "latest-posts.html" . }} | |||||
| </article> | |||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| </body> | |||||
| </html> | |||||
| {{ partial "latest-posts.html" . }} | |||||
| </article> | |||||
| {{ end }} | |||||
+ 16
- 0
layouts/_default/baseof.html
View File
| @ -0,0 +1,16 @@ | |||||
| <!DOCTYPE html> | |||||
| <html lang="{{ .Site.LanguageCode | default "en" }}"> | |||||
| <head> | |||||
| {{ partial "head.html" . }} | |||||
| </head> | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| <section id="wrapper"> | |||||
| {{ block "profile" . }}{{ end }} | |||||
| {{ block "main" . -}}{{- end }} | |||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| {{ partial "js.html" . }} | |||||
| </body> | |||||
| </html> | |||||
+ 4
- 11
layouts/_default/list.html
View File
| @ -1,14 +1,7 @@ | |||||
| {{ partial "head.html" . }} | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| {{ partial "profile.html" . }} | |||||
| <section id="wrapper" class="home"> | |||||
| {{ define "profile" }}{{ partial "profile.html" . }}{{ end }} | |||||
| {{ define "main" }} | |||||
| {{ partial "post-list.html" . }} | {{ partial "post-list.html" . }} | ||||
| {{ partial "pagination.html" . }} | {{ partial "pagination.html" . }} | ||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| {{ partial "js.html" . }} | |||||
| </body> | |||||
| </html> | |||||
| {{ end }} | |||||
+ 36
- 43
layouts/_default/single.html
View File
| @ -1,46 +1,39 @@ | |||||
| {{ partial "head.html" . }} | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| {{ define "main" }} | |||||
| <article class="post"> | |||||
| <header> | |||||
| <h1>{{ .Title }}</h1> | |||||
| <h2 class="subtitle">{{ .Description | markdownify }}</h2> | |||||
| <h2 class="headline"> | |||||
| {{ .Date.Format "January 2, 2006" }} | |||||
| <br> | |||||
| {{ with .Params.tags }} | |||||
| {{ if ge (len .) 1 }} | |||||
| {{ range . }} | |||||
| <a href="{{ printf "tags/%s" (. | urlize) | absURL }}">{{ . }}</a> | |||||
| {{ end }} | |||||
| {{ end }} | |||||
| {{ end}} | |||||
| </h2> | |||||
| </header> | |||||
| <section id="post-body"> | |||||
| {{ .Content }} | |||||
| </section> | |||||
| </article> | |||||
| <section id="wrapper"> | |||||
| <article class="post"> | |||||
| <header> | |||||
| <h1>{{ .Title }}</h1> | |||||
| <h2 class="headline"> | |||||
| {{ .Date.Format "January 2, 2006" }} | |||||
| <br> | |||||
| {{ with .Params.tags }} | |||||
| {{ if ge (len .) 1 }} | |||||
| {{ range . }} | |||||
| <a href="{{ $.Site.BaseURL }}tags/{{ . | urlize }}">{{ . }}</a> | |||||
| {{ end }} | |||||
| {{ end }} | |||||
| {{ end}} | |||||
| </h2> | |||||
| </header> | |||||
| <section id="post-body"> | |||||
| {{ .Content }} | |||||
| </section> | |||||
| </article> | |||||
| <footer id="post-meta" class="clearfix"> | |||||
| {{ with .Site.Params.twitter }}<a href="https://twitter.com/{{ . }}">{{ end }} | |||||
| <img class="avatar" src="{{ .Site.BaseURL }}images/avatar.png"> | |||||
| <div> | |||||
| <span class="dark">{{ .Site.Params.name }}</span> | |||||
| <span>{{ .Site.Params.aboutAuthor }}</span> | |||||
| </div> | |||||
| {{ with .Site.Params.twitter }}</a>{{ end }} | |||||
| <section id="sharing"> | |||||
| {{ partial "share.html" . }} | |||||
| </section> | |||||
| </footer> | |||||
| <footer id="post-meta" class="clearfix"> | |||||
| {{ with .Site.Params.twitter }}<a href="https://twitter.com/{{ . }}">{{ end }} | |||||
| <img class="avatar" src="{{ "images/avatar.png" | absURL }}"> | |||||
| <div> | |||||
| <span class="dark">{{ .Site.Params.name }}</span> | |||||
| <span>{{ .Site.Params.aboutAuthor }}</span> | |||||
| </div> | |||||
| {{ with .Site.Params.twitter }}</a>{{ end }} | |||||
| <section id="sharing"> | |||||
| {{ partial "share.html" . }} | |||||
| </section> | |||||
| </footer> | |||||
| {{ template "_internal/disqus.html" . }} | |||||
| {{ template "_internal/disqus.html" . }} | |||||
| {{ partial "latest-posts.html" . }} | |||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| {{ partial "js.html" . }} | |||||
| </body> | |||||
| </html> | |||||
| {{ partial "latest-posts.html" . }} | |||||
| {{ end }} | |||||
+ 5
- 0
layouts/about/list.html
View File
| @ -0,0 +1,5 @@ | |||||
| {{ define "profile" }} | |||||
| {{ partial "profile.html" . }} | |||||
| {{ end }} | |||||
| {{ define "main" }}{{ .Content }}{{ end }} | |||||
+ 0
- 13
layouts/about/single.html
View File
| @ -1,13 +0,0 @@ | |||||
| {{ partial "head.html" . }} | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| {{ partial "profile.html" . }} | |||||
| <section id="wrapper" class="home"> | |||||
| {{ .Content }} | |||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| {{ partial "js.html" . }} | |||||
| </body> | |||||
| </html> | |||||
+ 7
- 14
layouts/index.html
View File
| @ -1,15 +1,8 @@ | |||||
| {{ partial "head.html" . }} | |||||
| <body> | |||||
| {{ partial "nav.html" . }} | |||||
| {{ define "profile" }} | |||||
| {{ partial "profile.html" . }} | |||||
| {{ end }} | |||||
| {{ partial "profile.html" . }} | |||||
| <section id="wrapper" class="home"> | |||||
| {{ partial "post-list.html" . }} | |||||
| {{ partial "pagination.html" . }} | |||||
| {{ partial "footer.html" . }} | |||||
| </section> | |||||
| {{ partial "js.html" . }} | |||||
| </body> | |||||
| </html> | |||||
| {{ define "main" }} | |||||
| {{ partial "post-list.html" . }} | |||||
| {{ partial "pagination.html" . }} | |||||
| {{ end }} | |||||
+ 1
- 1
layouts/partials/footer.html
View File
+ 25
- 29
layouts/partials/head.html
View File
| @ -1,32 +1,28 @@ | |||||
| <!DOCTYPE html> | |||||
| <html {{ with .Site.LanguageCode }}lang="{{ . }}"{{ end }}> | |||||
| <head> | |||||
| <meta charset="utf-8"> | |||||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | |||||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |||||
| {{ with .Site.Params.name }}<meta name="author" content="{{ . }}">{{ end }} | |||||
| {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }} | |||||
| {{ .Hugo.Generator }} | |||||
| <title>{{ if .IsHome }}{{ .Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }}</title> | |||||
| <link rel="shortcut icon" href="{{ .Site.BaseURL }}images/favicon.ico"> | |||||
| <link rel="stylesheet" href="{{ .Site.BaseURL }}css/style.css"> | |||||
| <link rel="stylesheet" href="{{ .Site.BaseURL }}css/highlight.css"> | |||||
| {{ range .Site.Params.customCSS }} | |||||
| <link rel="stylesheet" href="{{ $.Site.BaseURL }}{{ . }}"> | |||||
| {{ end }} | |||||
| <meta charset="utf-8"> | |||||
| <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | |||||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |||||
| {{ with .Site.Params.name }}<meta name="author" content="{{ . }}">{{ end }} | |||||
| {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }} | |||||
| {{ .Hugo.Generator }} | |||||
| <title>{{ .Title }}{{ if .IsHome }} · {{ .Site.Title }}{{ end }}</title> | |||||
| <link rel="shortcut icon" href="{{ "images/favicon.ico" | absURL }}"> | |||||
| <link rel="stylesheet" href="{{ "css/style.css" | absURL }}"> | |||||
| <link rel="stylesheet" href="{{ "css/highlight.css" | absURL }}"> | |||||
| {{ range .Site.Params.customCSS }} | |||||
| <link rel="stylesheet" href="{{ . | absURL }}"> | |||||
| {{ end }} | |||||
| {{ if eq .Site.Params.iconFont "font-awesome" }} | |||||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"> | |||||
| {{ else }} | |||||
| <link rel="stylesheet" href="{{ .Site.BaseURL }}css/monosocialiconsfont.css"> | |||||
| {{ end }} | |||||
| {{ if eq .Site.Params.iconFont "font-awesome" }} | |||||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"> | |||||
| {{ else }} | |||||
| <link rel="stylesheet" href="{{ "css/monosocialiconsfont.css" | absURL }}"> | |||||
| {{ end }} | |||||
| {{ if .Site.Params.enableRSS }} | |||||
| <link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> | |||||
| {{ end }} | |||||
| {{ if .Site.Params.enableRSS }} | |||||
| <link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> | |||||
| {{ end }} | |||||
| {{ template "_internal/opengraph.html" . }} | |||||
| {{ template "_internal/google_news.html" . }} | |||||
| {{ template "_internal/schema.html" . }} | |||||
| {{ template "_internal/twitter_cards.html" . }} | |||||
| </head> | |||||
| {{ template "_internal/opengraph.html" . }} | |||||
| {{ template "_internal/google_news.html" . }} | |||||
| {{ template "_internal/schema.html" . }} | |||||
| {{ template "_internal/twitter_cards.html" . }} | |||||
+ 3
- 3
layouts/partials/js.html
View File
| @ -1,10 +1,10 @@ | |||||
| <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> | <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> | ||||
| <script src="{{ .Site.BaseURL }}js/main.js"></script> | |||||
| <script src="{{ .Site.BaseURL }}js/highlight.js"></script> | |||||
| <script src="{{ "js/main.js" | absURL }}"></script> | |||||
| <script src="{{ "js/highlight.js" | absURL }}"></script> | |||||
| <script>hljs.initHighlightingOnLoad();</script> | <script>hljs.initHighlightingOnLoad();</script> | ||||
| {{ range .Site.Params.customJS }} | {{ range .Site.Params.customJS }} | ||||
| <script src="{{ $.Site.BaseURL }}{{ . }}"></script> | |||||
| <script src="{{ . | absURL }}"></script> | |||||
| {{ end }} | {{ end }} | ||||
| {{ template "_internal/google_analytics.html" . }} | {{ template "_internal/google_analytics.html" . }} | ||||
+ 6
- 8
layouts/partials/latest-posts.html
View File
| @ -1,13 +1,11 @@ | |||||
| <ul id="post-list" class="archive readmore"> | <ul id="post-list" class="archive readmore"> | ||||
| <h3>{{ with .Site.Params.readMore }}{{ . }}{{ else }}Read more{{ end }}</h3> | |||||
| <h3>{{ .Site.Params.readMore | default "Read more" }}</h3> | |||||
| {{ $pages := where .Site.Pages "Kind" "page" }} | |||||
| {{ range first 10 (where $pages "Params.hidden" "ne" "true") }} | |||||
| {{ $url := replace .Permalink .Site.BaseURL "" }} | |||||
| {{ if and (ne $url "about/") }} | |||||
| {{ $kind := where .Site.RegularPages "Section" "!=" "" }} | |||||
| {{ $othr := where $kind "URL" "!=" .URL }} | |||||
| {{ range first 10 $othr }} | |||||
| <li> | <li> | ||||
| <a href="{{ .Permalink }}">{{ .Title }}<aside class="dates">{{ .Date.Format "Jan 2" }}</aside></a> | |||||
| <a href="{{ .URL }}">{{ .LinkTitle }}<aside class="dates">{{ .Date.Format "Jan 2 2006" }}</aside></a> | |||||
| </li> | </li> | ||||
| {{ end }} | |||||
| {{ end }} | |||||
| {{ end }} | |||||
| </ul> | </ul> | ||||
+ 6
- 7
layouts/partials/nav.html
View File
| @ -1,14 +1,13 @@ | |||||
| <nav class="main-nav"> | <nav class="main-nav"> | ||||
| {{ $url := replace .Permalink .Site.BaseURL "" }} | |||||
| {{ if not .IsHome }} | {{ if not .IsHome }} | ||||
| <a href='{{ .Site.BaseURL }}'> <span class="arrow">←</span>{{ with .Site.Params.home }}{{ . }}{{ else }}Home{{ end }}</a> | |||||
| <a href='{{ .Site.BaseURL }}'> <span class="arrow">←</span>{{ .Site.Params.home | default "Home" }}</a> | |||||
| {{ end }} | {{ end }} | ||||
| {{ if ne $url "about/" }} | |||||
| <a href='{{ .Site.BaseURL }}about'>{{ with .Site.Params.about }}{{ . }}{{ else }}About{{ end }}</a> | |||||
| {{ end }} | |||||
| {{ range .Site.Menus.main }} | |||||
| <a href='{{ .URL }}'>{{ .Name }}</a> | |||||
| {{ end }} | |||||
| {{ if .Site.Params.enableRSS }} | {{ if .Site.Params.enableRSS }} | ||||
| <a class="cta" href="{{ .Site.RSSLink }}">{{ with .Site.Params.subscribe }}{{ . }}{{ else }}Subscribe{{ end }}</a> | |||||
| <a class="cta" href="{{ .Site.RSSLink }}">{{ .Site.Params.subscribe | default "Subscribe" }}</a> | |||||
| {{ end }} | {{ end }} | ||||
| </nav> | |||||
| </nav> | |||||
+ 3
- 3
layouts/partials/pagination.html
View File
+ 6
- 9
layouts/partials/post-list.html
View File
| @ -1,11 +1,8 @@ | |||||
| <ul id="post-list"> | <ul id="post-list"> | ||||
| {{ range where .Paginator.Pages "Params.hidden" "ne" "true" }} | |||||
| {{ $url := replace .Permalink .Site.BaseURL "" }} | |||||
| {{ if ne $url "about/" }} | |||||
| <li> | |||||
| <a href='{{ .Permalink }}'><aside class="dates">{{ .Date.Format "Jan 2" }}</aside></a> | |||||
| <a href='{{ .Permalink }}'>{{ .Title }} <h2>{{ .Description | markdownify }}</h2></a> | |||||
| </li> | |||||
| {{ end }} | |||||
| {{ range where .Paginator.Pages "Section" "ne" "" }} | |||||
| <li> | |||||
| <a href='{{ .URL }}'><aside class="dates">{{ .Date.Format "Jan 2 2006" }}</aside></a> | |||||
| <a href='{{ .URL }}'>{{ .LinkTitle }}<h2>{{ .Description | markdownify }}</h2></a> | |||||
| </li> | |||||
| {{ end }} | {{ end }} | ||||
| </ul> | |||||
| </ul> | |||||
+ 3
- 3
layouts/partials/profile.html
View File
| @ -1,11 +1,11 @@ | |||||
| <div class="profile"> | <div class="profile"> | ||||
| <section id="wrapper"> | <section id="wrapper"> | ||||
| <header id="header"> | <header id="header"> | ||||
| <a href='{{ .Site.BaseURL }}about'> | |||||
| <img id="avatar" class="2x" src="{{ .Site.BaseURL }}images/avatar.png"/> | |||||
| <a href="{{ "about" | absURL }}"> | |||||
| <img id="avatar" class="2x" src="{{ "images/avatar.png" | absURL }}"/> | |||||
| </a> | </a> | ||||
| <h1>{{ .Site.Params.name }}</h1> | <h1>{{ .Site.Params.name }}</h1> | ||||
| <h2>{{ .Site.Params.bio | markdownify }}</h2> | <h2>{{ .Site.Params.bio | markdownify }}</h2> | ||||
| </header> | </header> | ||||
| </section> | </section> | ||||
| </div> | |||||
| </div> | |||||
+ 2
- 2
layouts/partials/share.html
View File
| @ -1,9 +1,9 @@ | |||||
| <a class="twitter" href="https://twitter.com/intent/tweet?text={{ .Permalink }} - {{ .Title }} {{ with .Site.Params.twitter }}by @{{ . }}{{ end }}"><span class="icon-twitter"> {{ with .Site.Params.tweet }}{{ . }}{{ else }}Tweet{{ end }}</span></a> | |||||
| <a class="twitter" href="https://twitter.com/intent/tweet?text={{ .Permalink }} - {{ .LinkTitle }} {{ with .Site.Params.twitter }}by @{{ . }}{{ end }}"><span class="icon-twitter"> {{ .Site.Params.tweet | default "tweet" }}</span></a> | |||||
| <a class="facebook" href="#" onclick=" | <a class="facebook" href="#" onclick=" | ||||
| window.open( | window.open( | ||||
| 'https://www.facebook.com/sharer/sharer.php?u='+encodeURIComponent(location.href), | 'https://www.facebook.com/sharer/sharer.php?u='+encodeURIComponent(location.href), | ||||
| 'facebook-share-dialog', | 'facebook-share-dialog', | ||||
| 'width=626,height=436'); | 'width=626,height=436'); | ||||
| return false;"><span class="icon-facebook-rect"> {{ with .Site.Params.share }}{{ . }}{{ else }}Share{{ end }}</span> | |||||
| return false;"><span class="icon-facebook-rect"> {{ .Site.Params.share | default "Share" }}</span> | |||||
| </a> | </a> | ||||