From 5177dc25b122e9aff36a4f5b356d02475aec36ad Mon Sep 17 00:00:00 2001 From: George Cushen Date: Sun, 14 Oct 2018 02:15:45 +0100 Subject: [PATCH] Sync Academic v3-dev --- config.toml | 14 ++++++----- content/home/hero.md | 36 +++++++++++++++++++++++++++ content/home/publications.md | 3 ++- content/home/publications_selected.md | 1 + content/home/talks.md | 3 ++- content/home/talks_selected.md | 1 + content/post/_index.md | 5 ++-- content/publication/_index.md | 3 +-- content/talk/_index.md | 5 ++-- netlify.toml | 2 +- themes/academic | 2 +- 11 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 content/home/hero.md diff --git a/config.toml b/config.toml index d37a1fe..a72414f 100644 --- a/config.toml +++ b/config.toml @@ -217,7 +217,14 @@ enableGitInfo = false # 1 = Detailed # 2 = APA # 3 = MLA - publication_format = 3 + # 4 = Stream + publication_format = 4 + + # Talk list format. + # 0 = Simple + # 1 = Detailed + # 2 = Stream + talk_format = 2 # Social/Academic Networking # @@ -292,11 +299,6 @@ enableGitInfo = false url = "#projects" weight = 4 -[[menu.main]] - name = "Teaching" - url = "#teaching" - weight = 5 - [[menu.main]] name = "Contact" url = "#contact" diff --git a/content/home/hero.md b/content/home/hero.md new file mode 100644 index 0000000..4cdd1f5 --- /dev/null +++ b/content/home/hero.md @@ -0,0 +1,36 @@ ++++ +# Hero widget. +widget = "hero" +active = false +date = 2017-10-15T00:00:00 + +title = "Academic" + +# Order that this section will appear in. +weight = 3 + +# Overlay a color or image (optional). +# Deactivate an option by commenting out the line, prefixing it with `#`. +[header] + overlay_color = "#666" # An HTML color value. + overlay_img = "headers/bubbles-wide.jpg" # Image path relative to your `static/img/` folder. + overlay_filter = 0.5 # Darken the image. Value in range 0-1. + +# Call to action button (optional). +# Activate the button by specifying a URL and button label below. +# Deactivate by commenting out parameters, prefixing lines with `#`. +[cta] + url = "./post/getting-started/" + label = ' Install Now' ++++ + +The highly flexible website framework for Hugo with an extensible plugin mechanism. Create a beautifully simple site in under 10 minutes :rocket: +
+ + Latest release + +
+
+ Star +
+ diff --git a/content/home/publications.md b/content/home/publications.md index d635d86..cc71e42 100644 --- a/content/home/publications.md +++ b/content/home/publications.md @@ -19,7 +19,8 @@ count = 10 # 1 = Detailed # 2 = APA # 3 = MLA -list_format = 3 +# 4 = Stream +list_format = 4 # Filter by publication type. # -1: Any diff --git a/content/home/publications_selected.md b/content/home/publications_selected.md index 09d83b1..ca9a5ae 100644 --- a/content/home/publications_selected.md +++ b/content/home/publications_selected.md @@ -17,6 +17,7 @@ weight = 10 # 1 = Detailed # 2 = APA # 3 = MLA +# 4 = Stream list_format = 1 # Filter by publication type. diff --git a/content/home/talks.md b/content/home/talks.md index ff13465..e293f1c 100644 --- a/content/home/talks.md +++ b/content/home/talks.md @@ -16,7 +16,8 @@ count = 10 # List format. # 0 = Simple # 1 = Detailed -list_format = 0 +# 2 = Stream +list_format = 2 # Exclude talks that are shown in the Selected Talks widget? exclude_selected = false diff --git a/content/home/talks_selected.md b/content/home/talks_selected.md index 2a0604c..bf7e667 100644 --- a/content/home/talks_selected.md +++ b/content/home/talks_selected.md @@ -13,5 +13,6 @@ weight = 29 # List format. # 0 = Simple # 1 = Detailed +# 3 = Stream list_format = 0 +++ diff --git a/content/post/_index.md b/content/post/_index.md index 88d40c0..196690b 100644 --- a/content/post/_index.md +++ b/content/post/_index.md @@ -1,13 +1,12 @@ +++ title = "Posts" date = 2017-01-01T00:00:00 -math = false -highlight = false # List format. # 0 = Simple # 1 = Detailed -list_format = 1 +# 2 = Stream +list_format = 2 # Optional featured image (relative to `static/img/` folder). [header] diff --git a/content/publication/_index.md b/content/publication/_index.md index 15ae860..2298435 100644 --- a/content/publication/_index.md +++ b/content/publication/_index.md @@ -1,14 +1,13 @@ +++ title = "Publications" date = 2017-01-01T00:00:00 -math = false -highlight = false # List format. # 0 = Simple # 1 = Detailed # 2 = APA # 3 = MLA +# 4 = Stream list_format = 3 # Optional featured image (relative to `static/img/` folder). diff --git a/content/talk/_index.md b/content/talk/_index.md index 31549b8..1bd2ab2 100644 --- a/content/talk/_index.md +++ b/content/talk/_index.md @@ -1,13 +1,12 @@ +++ title = "Recent & Upcoming Talks" date = 2017-01-01T00:00:00 -math = false -highlight = false # List format. # 0 = Simple # 1 = Detailed -list_format = 0 +# 2 = Stream +list_format = 2 # Optional featured image (relative to `static/img/` folder). [header] diff --git a/netlify.toml b/netlify.toml index 43c9967..ace83c6 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,6 +3,6 @@ command = "hugo" [context.production.environment] - HUGO_VERSION = "0.48" + HUGO_VERSION = "0.49.2" HUGO_ENV = "production" HUGO_ENABLEGITINFO = "true" diff --git a/themes/academic b/themes/academic index f78135f..061b56a 160000 --- a/themes/academic +++ b/themes/academic @@ -1 +1 @@ -Subproject commit f78135f432b2f1115cca32825e0f25f06ba45213 +Subproject commit 061b56a088532d03b64ffb3848819f55cd0b3db1