diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdd0de..a624bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,39 +1,71 @@ # 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. [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. [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`. -### 2015/26/11 +## 26th November 2015 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). [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) diff --git a/README.md b/README.md index e529859..17c6439 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,6 @@ Make sure to update the `themesDir` property in the config file to point to your Use the about page to introduce yourself to your visitors. You can customize the content as you like in the [`config.toml`](//github.com/digitalcraftsman/hugo-cactus-theme/blob/dev/exampleSite/config.toml). Furthermore, you should replace the [avatar placeholder](//github.com/digitalcraftsman/hugo-cactus-theme/blob/master/static/images/avatar.png) with a great image of yourself. -## Hide pages - -Pages can be hidden and don't appear in the post list on the homepage if you add the variable `hidden = true` to the frontmatter. This allows you to link from elsewhere, i.e. just the menu. - ## Disqus This theme features a comment system powered by Disqus too. Just add your Disqus-shortname to the [`config.toml`](//github.com/digitalcraftsman/hugo-cactus-theme/blob/dev/exampleSite/config.toml) and let readers respond to your blog posts. @@ -46,7 +42,7 @@ Assign either `font-awesome` or `mono-social` to the `iconFont` variable. The Mo ## Nearly finished -In order to see your site in action, run Hugo's built-in local server. +In order to see your site in action, run Hugo's built-in local server. $ hugo server @@ -67,7 +63,7 @@ This theme is released under the MIT license. For more information read the [lic ## Acknowledgements -Thanks to +Thanks to - [Nick Balestra](//github.com/nickbalestra/kactus) for creating the original theme - [Steve Francia](//github.com/spf13) for creating Hugo and the awesome community around the project. diff --git a/archetypes/default.md b/archetypes/default.md index a7aca45..17a3207 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,4 +1,5 @@ -+++ -title = "" -description = "" -+++ +--- +title: "{{ replace .TranslationBaseName "-" " " | title }}" +date: {{ .Date }} +draft: true +--- diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 829b9fe..8d758c5 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -12,7 +12,7 @@ disqusShortname = "spf13" [params] name = "John Doe" description = "Describe your website" - bio = "Blogger - Programmer - Gopher" + bio = "Blogger & Programmer" # Enter optionally your twitter account twitter = "Your Twitter account" enableRSS = true @@ -27,7 +27,6 @@ disqusShortname = "spf13" # Navigation links home = "" - about = "" subscribe = "" # Pagination links olderPosts = "" @@ -35,7 +34,7 @@ disqusShortname = "spf13" readMore = "" copyright = "" # Sharing options and author information in posts - aboutAuthor = "I'm an enthusiastic gopher." + aboutAuthor = "I'm an blogger." tweet = "" share = "" # 404 page diff --git a/exampleSite/content/about/index.md b/exampleSite/content/about/_index.md similarity index 96% rename from exampleSite/content/about/index.md rename to exampleSite/content/about/_index.md index e39b15d..86ccf66 100644 --- a/exampleSite/content/about/index.md +++ b/exampleSite/content/about/_index.md @@ -2,6 +2,7 @@ date = "2015-06-20T14:02:37+02:00" title = "About" hidden = true +menu = "main" +++ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsa ullam earum dolorum! Sed, perspiciatis. @@ -12,4 +13,4 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit. ### Lorem ipsum dolor. -Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea dicta corporis ad inventore itaque impedit dolor atque amet exercitationem! Veniam qui voluptas maiores vel laudantium necessitatibus, velit ducimus! Iste hic facere, accusamus fugiat enim facilis. \ No newline at end of file +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea dicta corporis ad inventore itaque impedit dolor atque amet exercitationem! Veniam qui voluptas maiores vel laudantium necessitatibus, velit ducimus! Iste hic facere, accusamus fugiat enim facilis. diff --git a/exampleSite/content/post/creating-a-new-theme.md b/exampleSite/content/post/creating-a-new-theme.md index 3f0d1b9..6315784 100644 --- a/exampleSite/content/post/creating-a-new-theme.md +++ b/exampleSite/content/post/creating-a-new-theme.md @@ -2,13 +2,7 @@ author: "Michael Henderson" date: 2014-09-28 linktitle: Creating a New Theme -menu: - main: - parent: tutorials -next: /tutorials/github-pages-blog -prev: /tutorials/automated-deployments title: Creating a New Theme -weight: 10 --- diff --git a/exampleSite/content/post/goisforlovers.md b/exampleSite/content/post/goisforlovers.md index 8065477..41d20f1 100644 --- a/exampleSite/content/post/goisforlovers.md +++ b/exampleSite/content/post/goisforlovers.md @@ -13,7 +13,6 @@ categories = [ "Development", "golang", ] -menu = "main" +++ Hugo uses the excellent [go][] [html/template][gohtmltemplate] library for diff --git a/exampleSite/content/post/hugoisforlovers.md b/exampleSite/content/post/hugoisforlovers.md index f84224a..73994ba 100644 --- a/exampleSite/content/post/hugoisforlovers.md +++ b/exampleSite/content/post/hugoisforlovers.md @@ -12,7 +12,6 @@ categories = [ "Development", "golang", ] -menu = "main" +++ ## Step 1. Install Hugo diff --git a/exampleSite/content/post/migrate-from-jekyll.md b/exampleSite/content/post/migrate-from-jekyll.md index a38507b..bcf50b2 100644 --- a/exampleSite/content/post/migrate-from-jekyll.md +++ b/exampleSite/content/post/migrate-from-jekyll.md @@ -1,12 +1,7 @@ --- date: 2014-03-10 linktitle: Migrating from Jekyll -menu: - main: - parent: tutorials -prev: /tutorials/mathjax title: Migrate to Hugo from Jekyll -weight: 10 --- ## Move static content to `static` diff --git a/layouts/404.html b/layouts/404.html index d5b27a6..e98d890 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,18 +1,10 @@ - {{ partial "head.html" . }} - - {{ partial "nav.html" . }} +{{ define "main" }} +
+
+

{{ .Site.Params.title404 | default "404 - Page not found" }}

+

{{ .Site.Params.subtitle404 | default "The content you're looking for doesn't seem to exist." }}

+
-
-
-
-

{{ with .Site.Params.title404 }}{{ . }}{{ else }}404 - Page not found{{ end }}

-

{{ with .Site.Params.subtitle404 }}{{ . }}{{ else }}The content you're looking for doesn't seem to exist.{{ end }}

-
- - {{ partial "latest-posts.html" . }} -
- - {{ partial "footer.html" . }} -
- - + {{ partial "latest-posts.html" . }} +
+{{ end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..9ad1717 --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,16 @@ + + + + {{ partial "head.html" . }} + + + {{ partial "nav.html" . }} +
+ {{ block "profile" . }}{{ end }} + {{ block "main" . -}}{{- end }} + + {{ partial "footer.html" . }} +
+ {{ partial "js.html" . }} + + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f477fa3..090fb62 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,14 +1,7 @@ - {{ partial "head.html" . }} - - {{ partial "nav.html" . }} - {{ partial "profile.html" . }} -
+{{ define "profile" }}{{ partial "profile.html" . }}{{ end }} + +{{ define "main" }} {{ partial "post-list.html" . }} {{ partial "pagination.html" . }} - {{ partial "footer.html" . }} -
- - {{ partial "js.html" . }} - - +{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index f210952..e13d194 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,46 +1,39 @@ - {{ partial "head.html" . }} - - {{ partial "nav.html" . }} +{{ define "main" }} +
+
+

{{ .Title }}

+

{{ .Description | markdownify }}

+

+ {{ .Date.Format "January 2, 2006" }} +
+ {{ with .Params.tags }} + {{ if ge (len .) 1 }} + {{ range . }} + {{ . }} + {{ end }} + {{ end }} + {{ end}} +

+
+
+ {{ .Content }} +
+
-
-
-
-

{{ .Title }}

-

- {{ .Date.Format "January 2, 2006" }} -
- {{ with .Params.tags }} - {{ if ge (len .) 1 }} - {{ range . }} - {{ . }} - {{ end }} - {{ end }} - {{ end}} -

-
-
- {{ .Content }} -
-
- + - {{ template "_internal/disqus.html" . }} +{{ template "_internal/disqus.html" . }} - {{ partial "latest-posts.html" . }} - {{ partial "footer.html" . }} -
- - {{ partial "js.html" . }} - - +{{ partial "latest-posts.html" . }} +{{ end }} diff --git a/layouts/about/list.html b/layouts/about/list.html new file mode 100644 index 0000000..ec993fd --- /dev/null +++ b/layouts/about/list.html @@ -0,0 +1,5 @@ +{{ define "profile" }} + {{ partial "profile.html" . }} +{{ end }} + +{{ define "main" }}{{ .Content }}{{ end }} diff --git a/layouts/about/single.html b/layouts/about/single.html deleted file mode 100644 index 8aeb280..0000000 --- a/layouts/about/single.html +++ /dev/null @@ -1,13 +0,0 @@ - {{ partial "head.html" . }} - - {{ partial "nav.html" . }} - {{ partial "profile.html" . }} - -
- {{ .Content }} - {{ partial "footer.html" . }} -
- - {{ partial "js.html" . }} - - diff --git a/layouts/index.html b/layouts/index.html index 74411da..ad6e221 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,15 +1,8 @@ - {{ partial "head.html" . }} - - {{ partial "nav.html" . }} +{{ define "profile" }} + {{ partial "profile.html" . }} +{{ end }} - {{ partial "profile.html" . }} - -
- {{ partial "post-list.html" . }} - {{ partial "pagination.html" . }} - {{ partial "footer.html" . }} -
- - {{ partial "js.html" . }} - - +{{ define "main" }} + {{ partial "post-list.html" . }} + {{ partial "pagination.html" . }} +{{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 08524c6..1248c66 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -6,7 +6,7 @@ {{ with .Site.Params.copyright }} {{ . | markdownify }} {{ else }} - © Copyright {{.Now.Format "2006"}} {{ .Site.Params.name }} + © Copyright {{ now.Format "2006" }} {{ .Site.Params.name }} {{ end }}

diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6871de0..a98efc6 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,32 +1,28 @@ - - - - - - - {{ with .Site.Params.name }}{{ end }} - {{ with .Site.Params.description }}{{ end }} - {{ .Hugo.Generator }} - {{ if .IsHome }}{{ .Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }} - - - - {{ range .Site.Params.customCSS }} - - {{ end }} + + + +{{ with .Site.Params.name }}{{ end }} +{{ with .Site.Params.description }}{{ end }} +{{ .Hugo.Generator }} +{{ .Title }}{{ if .IsHome }} · {{ .Site.Title }}{{ end }} + + + +{{ range .Site.Params.customCSS }} + +{{ end }} - {{ if eq .Site.Params.iconFont "font-awesome" }} - - {{ else }} - - {{ end }} +{{ if eq .Site.Params.iconFont "font-awesome" }} + +{{ else }} + +{{ end }} - {{ if .Site.Params.enableRSS }} - - {{ end }} +{{ if .Site.Params.enableRSS }} + +{{ end }} - {{ template "_internal/opengraph.html" . }} - {{ template "_internal/google_news.html" . }} - {{ template "_internal/schema.html" . }} - {{ template "_internal/twitter_cards.html" . }} - +{{ template "_internal/opengraph.html" . }} +{{ template "_internal/google_news.html" . }} +{{ template "_internal/schema.html" . }} +{{ template "_internal/twitter_cards.html" . }} diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 028d84b..c1810f4 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -1,10 +1,10 @@ - - + + {{ range .Site.Params.customJS }} - + {{ end }} {{ template "_internal/google_analytics.html" . }} diff --git a/layouts/partials/latest-posts.html b/layouts/partials/latest-posts.html index f5589d5..344518f 100644 --- a/layouts/partials/latest-posts.html +++ b/layouts/partials/latest-posts.html @@ -1,13 +1,11 @@ diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 1716e92..f88ea95 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,14 +1,13 @@ \ No newline at end of file + diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 00c1124..f4fa962 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -3,16 +3,16 @@ {{ if .Paginator.HasPrev }} - ← {{ with .Site.Params.newerPosts }}{{ . }}{{ else }}Newer Posts{{ end }} + ← {{ .Site.Params.newerPosts | default "Newer Posts" }} {{ end }} {{ if .Paginator.HasNext }} - {{ with .Site.Params.olderPosts }}{{ . }}{{ else }}Older Posts{{ end }} → + {{ .Site.Params.olderPosts | default "Older Posts" }}→ {{ end }} {{ end }} - \ No newline at end of file + diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html index 090bda1..969ca68 100644 --- a/layouts/partials/post-list.html +++ b/layouts/partials/post-list.html @@ -1,11 +1,8 @@ \ No newline at end of file + diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html index d58f285..e1f2927 100644 --- a/layouts/partials/profile.html +++ b/layouts/partials/profile.html @@ -1,11 +1,11 @@
-
\ No newline at end of file + diff --git a/layouts/partials/share.html b/layouts/partials/share.html index ef6c620..ae73b21 100644 --- a/layouts/partials/share.html +++ b/layouts/partials/share.html @@ -1,9 +1,9 @@ - {{ with .Site.Params.tweet }}{{ . }}{{ else }}Tweet{{ end }} + {{ .Site.Params.tweet | default "tweet" }} {{ with .Site.Params.share }}{{ . }}{{ else }}Share{{ end }} + return false;"> {{ .Site.Params.share | default "Share" }} diff --git a/static/css/style.css b/static/css/style.css index 6cfe83c..a514726 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -43,7 +43,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb .icon-facebook-rect:before { content: '\e803'; } /* Spacing */ -.post h1, h3, h4, h5, p, .post-body ul, pre { +.post h1, h3, h4, h5, p, .post-body ul, ol, pre { margin-bottom: 20px; } @@ -71,7 +71,7 @@ h2 { .profile #wrapper { padding: 100px 40px 0px; - max-width: 600px; + max-width: 800px; margin: 0 auto; } @@ -137,13 +137,13 @@ nav.main-nav a.cta { } #wrapper { - max-width: 600px; + max-width: 800px; margin: 0 auto; padding: 60px 40px 100px 40px; } #wrapper.home { - max-width: 600px; + max-width: 800px; margin: 0 auto; padding: 0px 40px 20px 40px; } @@ -180,8 +180,10 @@ a, transition: all 0.15s ease; } -ul { margin:0; padding:0; margin-bottom: 20px; } -li { list-style-type:circle; list-style-position:inside; } +ul, ol { margin:0; padding:0; margin-bottom: 20px; } +ul { list-style-type:circle; } +ol { list-style: decimal; } +li { list-style-position:inside; } /* Line Height */ #post-body, p { line-height:1.7; } @@ -225,7 +227,7 @@ em, i { font-style: italic; } } .post h1 { - margin-bottom: 20px; + margin-bottom: 0px; color: #222; font: 300 32px/1.4em "Helvetica Neue", Helvetica,Arial,sans-serif; } @@ -236,6 +238,10 @@ em, i { font-style: italic; } color: #111; } +.post h2.subtitle { + font: italic 19px/1.3em Georgia,serif; + color: #bbb; +} .post h2.headline { /*font: italic 22px/1.3em Georgia,serif;*/ diff --git a/theme.toml b/theme.toml index 4f04f3b..edd4242 100644 --- a/theme.toml +++ b/theme.toml @@ -1,11 +1,11 @@ name = "Cactus" license = "MIT" -licenselink = "//github.com/digitalcraftsman/hugo-cactus-theme/blob/master/LICENSE.md" +licenselink = "https://github.com/digitalcraftsman/hugo-cactus-theme/blob/master/License.md" description = "A minimalistic and responsive theme for bloggers." -homepage = "//github.com/digitalcraftsman/hugo-cactus-theme" +homepage = "https://github.com/digitalcraftsman/hugo-cactus-theme" tags = ["blog", "disqus", "google analytics", "rss", "syntax highlighting"] -features = ["disqus", "google analytics", "rss", "syntax highlighting", "blog", "pagination", "