From c7e09f4aa410fc25dce247966f60c78e782d0ab7 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Sun, 24 Feb 2019 01:23:30 +0000 Subject: [PATCH] theme: sync v4.1 dev and upgrade home sections to use Pages widget --- content/home/hero.md | 15 +++---- content/home/posts.md | 71 ++++++++++++++++++++++++------- content/home/publications.md | 82 ++++++++++++++++++++++++------------ content/home/tags.md | 2 +- content/home/talks.md | 70 ++++++++++++++++++++++++------ content/home/teaching.md | 20 ++++----- scripts/init_kickstart.sh | 4 +- themes/academic | 2 +- 8 files changed, 190 insertions(+), 76 deletions(-) diff --git a/content/home/hero.md b/content/home/hero.md index 4028b59..7b50526 100644 --- a/content/home/hero.md +++ b/content/home/hero.md @@ -2,20 +2,19 @@ # Hero widget. widget = "hero" # Do not modify this line! active = false # Activate this widget? true/false +weight = 3 # Order that this section will appear. title = "Academic" -# Order that this section will appear in. -weight = 3 - # Hero image (optional). Enter filename of an image in the `static/img/` folder. hero_media = "" -# Background (optional). -# Choose from a background color, gradient, or image. -# Choose a dark or light text color, by setting `text_color_light`. -# Delete or comment out (by prefixing `#`) any unused options. -[background] +[design.background] + # Apply a background color, gradient, or image. + # Uncomment (by removing `#`) an option to apply it. + # Choose a light or dark text color by setting `text_color_light`. + # Any HTML color name or Hex value is valid. + # Background color. # color = "navy" diff --git a/content/home/posts.md b/content/home/posts.md index 97db3a5..fa0003c 100644 --- a/content/home/posts.md +++ b/content/home/posts.md @@ -1,25 +1,66 @@ +++ -# Recent Posts widget. -# This widget displays recent posts from `content/post/`. -widget = "posts" # Do not modify this line! +# A Recent Blog Posts section created with the Pages widget. +# This section displays recent blog posts from `content/post/`. + +widget = "pages" # Do not modify this line! active = true # Activate this widget? true/false weight = 40 # Order that this section will appear. title = "Recent Posts" subtitle = "" -# Number of recent posts to list. -count = 5 +[content] + # Page type to display. E.g. post, talk, or publication. + page_type = "post" + + # Choose how much pages you would like to display (0 = all pages) + count = 5 + + # Choose how many pages you would like to offset by + offset = 0 -# View. -# 1 = List -# 2 = Compact -# 3 = Card -view = 2 + # Page order. Descending (desc) or ascending (asc) date. + order = "desc" -# Filter posts by tag or category. -# E.g. to only show posts tagged with `Academic`, set `filter_tag = "Academic"` -filter_tag = "" -filter_category = "" + # Filter posts by a taxonomy term. + [content.filters] + tag = "" + category = "" + publication_type = "" + exclude_featured = false + +[design] + # Toggle between the various page layout types. + # 1 = List + # 2 = Compact + # 3 = Card + # 4 = Citation (publication only) + view = 2 + +[design.background] + # Apply a background color, gradient, or image. + # Uncomment (by removing `#`) an option to apply it. + # Choose a light or dark text color by setting `text_color_light`. + # Any HTML color name or Hex value is valid. + + # Background color. + # color = "navy" + + # Background gradient. + # gradient_start = "DeepSkyBlue" + # gradient_end = "SkyBlue" + + # Background image. + # image = "background.jpg" # Name of image in `static/img/`. + # image_darken = 0.6 # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque. + + # Text color (true=light or false=dark). + text_color_light = true + +[advanced] + # Custom CSS. + css_style = "" + + # CSS class. + css_class = "" +++ - diff --git a/content/home/publications.md b/content/home/publications.md index ccfc558..ee56d81 100644 --- a/content/home/publications.md +++ b/content/home/publications.md @@ -1,38 +1,68 @@ +++ -# Recent Publications widget. -# This widget displays recent publications from `content/publication/`. -widget = "publications" # Do not modify this line! +# A Recent Publications section created with the Pages widget. +# This section displays recent blog posts from `content/publication/`. + +widget = "pages" # Do not modify this line! active = true # Activate this widget? true/false +weight = 20 # Order that this section will appear. title = "Recent Publications" subtitle = "" -# Order that this section will appear in. -weight = 20 +[content] + # Page type to display. E.g. post, talk, or publication. + page_type = "publication" + + # Choose how much pages you would like to display (0 = all pages) + count = 5 + + # Choose how many pages you would like to offset by + offset = 0 -# Number of publications to list. -count = 10 + # Page order. Descending (desc) or ascending (asc) date. + order = "desc" -# View. -# 1 = List -# 2 = Compact -# 3 = Card -# 4 = Citation -view = 2 + # Filter posts by a taxonomy term. + [content.filters] + tag = "" + category = "" + publication_type = "" + exclude_featured = false + +[design] + # Toggle between the various page layout types. + # 1 = List + # 2 = Compact + # 3 = Card + # 4 = Citation (publication only) + view = 2 + +[design.background] + # Apply a background color, gradient, or image. + # Uncomment (by removing `#`) an option to apply it. + # Choose a light or dark text color by setting `text_color_light`. + # Any HTML color name or Hex value is valid. + + # Background color. + # color = "navy" + + # Background gradient. + # gradient_start = "DeepSkyBlue" + # gradient_end = "SkyBlue" + + # Background image. + # image = "background.jpg" # Name of image in `static/img/`. + # image_darken = 0.6 # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque. -# Filter by publication type. -# -1: Any -# 0: Uncategorized -# 1: Conference proceedings -# 2: Journal -# 3: Work in progress -# 4: Technical report -# 5: Book -# 6: Book chapter -publication_type = "-1" - -# Exclude publications that are shown in the Featured Publications widget? -exclude_featured = false + # Text color (true=light or false=dark). + text_color_light = true + +[advanced] + # Custom CSS. + css_style = "" + + # CSS class. + css_class = "" +++ {{% alert note %}} diff --git a/content/home/tags.md b/content/home/tags.md index 84a5966..5666605 100644 --- a/content/home/tags.md +++ b/content/home/tags.md @@ -3,7 +3,7 @@ widget = "tag_cloud" # Do not modify this line! active = true # Activate this widget? true/false -title = "Tags" +title = "Popular Topics" subtitle = "" # Order that this section will appear in. diff --git a/content/home/talks.md b/content/home/talks.md index b76ac36..bfe4147 100644 --- a/content/home/talks.md +++ b/content/home/talks.md @@ -1,24 +1,66 @@ +++ -# Recent and Upcoming Talks widget. -widget = "talks" # Do not modify this line! +# A Recent and Upcoming Talks section created with the Pages widget. +# This section displays recent talks from `content/talk/`. + +widget = "pages" # Do not modify this line! active = true # Activate this widget? true/false +weight = 30 # Order that this section will appear. title = "Recent & Upcoming Talks" subtitle = "" -# Order that this section will appear in. -weight = 30 +[content] + # Page type to display. E.g. post, talk, or publication. + page_type = "talk" + + # Choose how much pages you would like to display (0 = all pages) + count = 5 + + # Choose how many pages you would like to offset by + offset = 0 -# Number of talks to list. -count = 10 + # Page order. Descending (desc) or ascending (asc) date. + order = "desc" -# View. -# 1 = List -# 2 = Compact -# 3 = Card -view = 2 + # Filter posts by a taxonomy term. + [content.filters] + tag = "" + category = "" + publication_type = "" + exclude_featured = false + +[design] + # Toggle between the various page layout types. + # 1 = List + # 2 = Compact + # 3 = Card + # 4 = Citation (publication only) + view = 2 + +[design.background] + # Apply a background color, gradient, or image. + # Uncomment (by removing `#`) an option to apply it. + # Choose a light or dark text color by setting `text_color_light`. + # Any HTML color name or Hex value is valid. -# Exclude talks that are shown in the Featured Talks widget? -exclude_featured = false + # Background color. + # color = "navy" + + # Background gradient. + # gradient_start = "DeepSkyBlue" + # gradient_end = "SkyBlue" + + # Background image. + # image = "background.jpg" # Name of image in `static/img/`. + # image_darken = 0.6 # Darken the image? Range 0-1 where 0 is transparent and 1 is opaque. + + # Text color (true=light or false=dark). + text_color_light = true + +[advanced] + # Custom CSS. + css_style = "" + + # CSS class. + css_class = "" +++ - diff --git a/content/home/teaching.md b/content/home/teaching.md index 9175eea..42440fa 100644 --- a/content/home/teaching.md +++ b/content/home/teaching.md @@ -1,22 +1,22 @@ +++ -# Custom widget. -# An example of using the custom widget to create your own homepage section. -# To create more sections, duplicate this file and edit the values below as desired. +# A Demo section created with the Custom widget. +# Any elements can be added in the body: https://sourcethemes.com/academic/docs/writing-markdown-latex/ +# Add more sections by duplicating this file and customizing to your requirements. + widget = "custom" # Do not modify this line! active = true # Activate this widget? true/false +weight = 60 # Order that this section will appear. # Note: a full width section format can be enabled by commenting out the `title` and `subtitle` with a `#`. title = "Custom Section" subtitle = "" -# Order that this section will appear in. -weight = 60 +[design.background] + # Apply a background color, gradient, or image. + # Uncomment (by removing `#`) an option to apply it. + # Choose a light or dark text color by setting `text_color_light`. + # Any HTML color name or Hex value is valid. -# Background (optional). -# Choose from a background color, gradient, or image. -# Choose a dark or light text color, by setting `text_color_light`. -# Delete or comment out (by prefixing `#`) any unused options. -[background] # Background color. # color = "navy" diff --git a/scripts/init_kickstart.sh b/scripts/init_kickstart.sh index a132021..5dc501d 100644 --- a/scripts/init_kickstart.sh +++ b/scripts/init_kickstart.sh @@ -3,7 +3,9 @@ # WARNING: this will reset the project to the Kickstart template! # Update Academic -source ../update_academic.sh +cd .. +source update_academic.sh +cd scripts/ ################################################# diff --git a/themes/academic b/themes/academic index 3ac394a..9985bc5 160000 --- a/themes/academic +++ b/themes/academic @@ -1 +1 @@ -Subproject commit 3ac394a58c2a76bed802db4fe9360496816c293e +Subproject commit 9985bc5e895fefe7fb95e83bbdf1e6133d39ef7b