From f0415e77aa1b0c17cb7adff3e7367d6c7d19bb8c Mon Sep 17 00:00:00 2001 From: pacollins Date: Thu, 28 Sep 2017 11:37:20 -0400 Subject: Update Theme --- archetypes/itemized.md | 2 +- exampleSite/config.toml | 117 +++++++++------- exampleSite/static/css/add-on.css | 6 + exampleSite/static/js/add-on.js | 0 layouts/_default/header.html | 22 +-- layouts/_default/list.html | 20 +-- layouts/_default/single.html | 22 +-- layouts/about/list.html | 22 +-- layouts/contact/list.html | 86 ++++++------ layouts/index.html | 20 +-- layouts/itemized/content-list.html | 2 +- layouts/itemized/content-single.html | 28 ++-- layouts/itemized/footer-category.html | 70 +++++----- layouts/itemized/header.html | 38 +++--- layouts/itemized/single.html | 20 +-- layouts/partials/favicon.html | 26 ++-- layouts/partials/footer.html | 56 ++++---- layouts/partials/general-title.html | 14 +- layouts/partials/header.html | 112 +++++++-------- layouts/partials/img-path.html | 28 ++-- layouts/partials/navbar.html | 111 ++++++++------- layouts/partials/pagination.html | 30 +++-- layouts/partials/share-links.html | 58 +++++--- layouts/partials/share-menu.html | 16 +-- layouts/partials/sidebar.html | 247 +++++++++++++++++----------------- layouts/partials/social.html | 122 ++++++++++------- layouts/post/comments.html | 14 +- layouts/post/content-list.html | 18 +-- layouts/post/content-single.html | 26 ++-- layouts/post/featured.html | 18 +-- layouts/post/footer-category.html | 70 +++++----- layouts/post/header.html | 44 +++--- layouts/post/prev-next.html | 18 +-- layouts/post/single.html | 20 +-- layouts/post/staticman.html | 2 +- layouts/shortcodes/img-fit.html | 58 ++++---- layouts/shortcodes/img-post.html | 78 +++++------ layouts/shortcodes/url-link.html | 12 +- layouts/taxonomy/category.html | 22 +-- layouts/taxonomy/category.terms.html | 54 ++++---- static/css/add-on.css | 6 - static/css/main.css | 90 +++++++------ theme.toml | 4 +- 43 files changed, 975 insertions(+), 874 deletions(-) create mode 100644 exampleSite/static/css/add-on.css create mode 100644 exampleSite/static/js/add-on.js delete mode 100644 static/css/add-on.css diff --git a/archetypes/itemized.md b/archetypes/itemized.md index 4479926..2bda772 100644 --- a/archetypes/itemized.md +++ b/archetypes/itemized.md @@ -8,7 +8,7 @@ featuredalt = "" featuredpath = "" link = "" linktitle = "" -platform = "" +format = "" title = "" type = "itemized" diff --git a/exampleSite/config.toml b/exampleSite/config.toml index c32c7d9..35e18d4 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -9,51 +9,55 @@ googleAnalytics = "" pluralizeListTitles = false [params] - # Sets the meta tag description, usually reserved for the main page + # Sets the meta tag description description = "HTML5 UP theme, Future Imperfect with some extra goodies, ported by Julio Pescador. Powered by Hugo" - # This will appear on the top left of the navigation bar + # Sets the navbarTitle that appears in the top left of the navigation bar navbarTitle = "Future Imperfect" - # set this to the section name if section is not post + # Sets where "View More Posts" links viewMorePostLink = "/blog/" # Optional Params - # This will match the navbarTitle to the section of the website + # Sets navbarTitle to match the section of the website dynamicTitles = true - # RSS icon that appear on the sidebar, next to the social media buttons + # Sets RSS icons to appear on the sidebar with the social media buttons rssAppearAtTop = true rssAppearAtBottom = true - # Social media buttons that appear on the sidebar + # Sets Social Media icons to appear on the sidebar socialAppearAtTop = true socialAppearAtBottom = true + # Sets Categories to sort by number of posts instead of alphabetical categoriesByCount = true + # Sets Estimated Reading Time to appear in post headers includeReadingTime = true - # The set of favicons used are based on the write-up from this link: + # Sets the Favicon and Version for the site. Default support is for + # apple-touch-icon-precomposed.png, favicon.png, favicon.ico, and mstile.png. + # These are stored in the favicon folder. See the following for more information: # https://github.com/audreyr/favicon-cheat-sheet - # Please see the favicon partial template for more information loadFavicon = false faviconVersion = "" - - # Disable showing the social sharing links on blog posts - socialShareDisabled = false - + # Sets Social Share links to appear on posts + socialShare = true # Load custom CSS or JavaScript files. The variable is an array so that you # can load multiple files if necessary. You can also load the standard theme # files by adding the value, "default". # customCSS = ["default", "/path/to/file"] # customJS = ["default", "/path/to/file"] - customCSS = ["default"] customJS = ["default"] -# Disqus will take priority over staticman due to its ease of use. Feel free to check out both and decide. +# Disqus will take priority over Staticman (github.com/eduardoboucas/staticman) +# due to its ease of use. Feel free to check out both and decide what you would +# prefer to use. See Staticman.yml for additional settings. [params.staticman] + # Sets Statiman to be active staticman = false + # Sets the location for Staticman to connect to username = "" repo = "" branch = "" -# parms.intro will appear on the sidebar -# This is optional, but it's suggested to use +# These are optional params related to the sidebar. They are recommended, but not +# required for proper functionality. HTML is supported within the params. [params.intro] header = "Hugo Future Imperfect" @@ -61,26 +65,23 @@ pluralizeListTitles = false about = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent tellus lacus, auctor vehicula molestie quis, tempor quis velit. Quisque in quam ac leo efficitur vulputate. Phasellus ullamcorper aliquam sodales. Maecenas sit amet condimentum ipsum. Proin sit amet ligula elit. Mauris." -# This will also appear on the sidebar. -# A width of less than 100px is recommended -# This is optional -[params.intro.pic] - src = "/img/main/logo.jpg" - # modify your picture in the shape of a circle or - # future imperfect's hexagonal shape - circle = false - imperfect = true - width = "" - alt = "Hugo Future Imperfect" + # This appears at the top of the sidebar above params.intro.header. + # A width of less than 100px is recommended from a design perspective. + [params.intro.pic] + src = "/img/main/logo.jpg" + # Sets Image to be a cirlce + circle = false + # Sets Image to be Future Imperfect's hexagon + imperfect = true + width = "" + alt = "Hugo Future Imperfect" -# Adjust the amount of recent posts on the sidebar. -# This is optional. The default value 5 will be used [params.postAmount] - sidebar = 2 - -# Set up your menu items in the navigation bar -# You can use identifier to prepend a font awesome icon to your text +# Sets the number of recent posts to show in the sidebar. The default value is 5. + sidebar = 5 +# Sets the menu items in the navigation bar +# Identifier prepends a Font Awesome icon to the menu item [[menu.main]] name = "Home" url = "/" @@ -117,35 +118,47 @@ pluralizeListTitles = false identifier = "fa fa-envelope-o" weight = 6 -# Insert your username and the icon will apear on the page as long as -# socialAppearAtTop or socialAppearAtBottom is set to true in the params area -# The social media icons will appear on the sidebar +# Sets Social Media icons to appear and link to your account. Value should be your +# username unless otherwise noted. These are the icons affected by socialAppearAtTop +# and socialAppearAtBottom. [social] + # Coding Communities github = "jpescador" + gitlab = "" + stackoverflow = "" # User Number bitbucket = "" jsfiddle = "" codepen = "" - foursquare = "" - dribbble = "" + # Visual Art Communities deviantart = "" - behance = "" flickr = "" - instagram = "" - youtube = "" - vimeo = "" - vine = "" - medium = "" + behance = "" + dribbble = "" + # Publishing Communities wordpress = "" - tumblr = "" - xing = "" + medium = "" + # Professional/Business Oriented Communities linkedin = "" + foursquare = "" + xing = "" slideshare = "" - stackoverflow = "" - reddit = "" - pinterest = "" - googleplus = "" + # Social Networks facebook = "" - facebook_admin = "" - twitter_domain = "" + googleplus = "" + reddit = "" + youtube = "" + vimeo = "" + whatsapp = "" # WhatsApp Number + # WeChat and QQ need testing. + wechat = "" + qq = "" # User ID Number + instagram = "" + tumblr = "" twitter = "julio_pescador" + skype = "" + snapchat = "" + pinterest = "" + telegram = "" + vine = "" + # Email email = "" diff --git a/exampleSite/static/css/add-on.css b/exampleSite/static/css/add-on.css new file mode 100644 index 0000000..b51259a --- /dev/null +++ b/exampleSite/static/css/add-on.css @@ -0,0 +1,6 @@ +/* + This css file is for individual users to restyle items for their personal site, + or for the implementation of features specifically for their site. Anything that + is an official part of the theme (ex. Pull Requests) should be included in main.css + within the formating given. +*/ diff --git a/exampleSite/static/js/add-on.js b/exampleSite/static/js/add-on.js new file mode 100644 index 0000000..e69de29 diff --git a/layouts/_default/header.html b/layouts/_default/header.html index f7184e7..92b0dc1 100644 --- a/layouts/_default/header.html +++ b/layouts/_default/header.html @@ -1,13 +1,13 @@
-
- {{ if $.Scratch.Get "h1" }} -

{{ .Title }}

- {{ $.Scratch.Set "h1" false }} - {{ else }} -

{{ .Title }}

- {{ end }} - {{ with .Description }} -

{{ . }}

- {{ end }} -
+
+ {{ if $.Scratch.Get "h1" }} +

{{ .Title }}

+ {{ $.Scratch.Set "h1" false }} + {{ else }} +

{{ .Title }}

+ {{ end }} + {{ with .Description }} +

{{ . }}

+ {{ end }} +
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9eaffcc..9a8d157 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,15 +1,15 @@ {{ partial "general-title" . }} {{ partial "header" . }} - {{ partial "navbar" . }} - -
- {{ $paginator := .Paginate .Data.Pages }} - {{ range .Paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} +{{ partial "navbar" . }} + +
+ {{ $paginator := .Paginate .Data.Pages }} + {{ range .Paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -
- {{ partial "sidebar" . }} + {{ partial "pagination" . }} +
+{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d0160bc..d94cf5a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,16 +1,16 @@ {{ partial "general-title" . }} {{ partial "header" . }} - {{ partial "navbar" . }} - -
-
- {{ $.Scratch.Set "h1" true }} - {{ .Render "header" }} -
- {{ .Content }} -
-
+{{ partial "navbar" . }} + +
+
+ {{ $.Scratch.Set "h1" true }} + {{ .Render "header" }} +
+ {{ .Content }}
- {{ partial "sidebar" . }} +
+
+{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/about/list.html b/layouts/about/list.html index e821afd..d490e3d 100644 --- a/layouts/about/list.html +++ b/layouts/about/list.html @@ -6,17 +6,17 @@
-
- {{ if $.Scratch.Get "h1" }} -

{{ .Title }}

- {{ $.Scratch.Set "h1" false }} - {{ else }} -

{{ .Title }}

- {{ end }} - {{ with .Description }} -

{{ . }}

- {{ end }} -
+
+ {{ if $.Scratch.Get "h1" }} +

{{ .Title }}

+ {{ $.Scratch.Set "h1" false }} + {{ else }} +

{{ .Title }}

+ {{ end }} + {{ with .Description }} +

{{ . }}

+ {{ end }} +
{{ .Content }} diff --git a/layouts/contact/list.html b/layouts/contact/list.html index cc2f35b..a585a4b 100644 --- a/layouts/contact/list.html +++ b/layouts/contact/list.html @@ -1,48 +1,48 @@ {{ partial "general-title" . }} {{ partial "header" . }} - {{ partial "navbar" . }} - -
-
-
-
- {{ if $.Scratch.Get "h1" }} -

{{ .Title }}

- {{ $.Scratch.Set "h1" false }} - {{ else }} -

{{ .Title }}

- {{ end }} - {{ with .Description }} -

{{ . }}

- {{ end }} -
-
-
- {{ .Content }} -
- {{ if .Params.netlify }} -
- {{ else }} - - {{ end }} -

Replies Typically Within 24 Hours.

-
- -
-
- -
-
- -
-
- -
-
-
-
-
+{{ partial "navbar" . }} + +
+
+
+
+ {{ if $.Scratch.Get "h1" }} +

{{ .Title }}

+ {{ $.Scratch.Set "h1" false }} + {{ else }} +

{{ .Title }}

+ {{ end }} + {{ with .Description }} +

{{ . }}

+ {{ end }} +
+
+
+ {{ .Content }} +
+ {{ if .Params.netlify }} +
+ {{ else }} + + {{ end }} +

Replies Typically Within 24 Hours.

+
+ +
+
+ +
+
+ +
+
+ +
+
+
- {{ partial "sidebar" . }} +
+
+{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/index.html b/layouts/index.html index be5f8da..d5bc1a6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,13 +1,13 @@ {{ partial "header" . }} - {{ $.Scratch.Set "shareNav" true }} - {{ partial "navbar" . }} - -
- {{ range first 1 (where .Site.Pages "Type" "post") }} - {{ .Render "content-single" }} +{{ $.Scratch.Set "shareNav" true }} +{{ partial "navbar" . }} + +
+ {{ range first 4 (where .Site.Pages "Type" "post") }} + {{ .Render "content-list" }} - {{ partial "share-menu" . }} - {{ end }} -
- {{ partial "sidebar" . }} + {{ partial "share-menu" . }} + {{ end }} +
+{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/itemized/content-list.html b/layouts/itemized/content-list.html index ae5be37..703baa9 100644 --- a/layouts/itemized/content-list.html +++ b/layouts/itemized/content-list.html @@ -1,3 +1,3 @@
- {{ .Render "header" }} + {{ .Render "header" }}
diff --git a/layouts/itemized/content-single.html b/layouts/itemized/content-single.html index 4c3a2b0..b047740 100644 --- a/layouts/itemized/content-single.html +++ b/layouts/itemized/content-single.html @@ -1,23 +1,21 @@
- {{ .Render "header" }} + {{ .Render "header" }} - {{ if not .Site.Params.socialShareDisabled }} + {{ if .Site.Params.socialShare }}
-
    - {{ partial "share-links" . }} -
+
    + {{ partial "share-links" . }} +
- {{ end }} + {{ end }} - {{ .Render "featured" }} -
- {{ .Content }} -
+ {{ .Render "featured" }} +
+ {{ .Content }} +
-
- {{ .Render "footer-category" }} -
+
+ {{ .Render "footer-category" }} +
{{ .Render "prev-next" }} - -{{ partials "comments" }} diff --git a/layouts/itemized/footer-category.html b/layouts/itemized/footer-category.html index 35d85a9..47a4308 100644 --- a/layouts/itemized/footer-category.html +++ b/layouts/itemized/footer-category.html @@ -1,44 +1,44 @@
    - {{ if isset .Params "categories" }} - {{ $categoryCount := (len .Params.categories) }} + {{ if isset .Params "categories" }} + {{ $categoryCount := (len .Params.categories) }} - - {{ if ge $categoryCount 1 }} -
  • - {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} - {{ if ne (len $categoryMenu) 0 }} - {{ $categoryMenu := index $categoryMenu 0 }} + + {{ if ge $categoryCount 1 }} +
  • + {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} + {{ if ne (len $categoryMenu) 0 }} + {{ $categoryMenu := index $categoryMenu 0 }} - {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} + {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} - {{ with $categoryMenu.Identifier }} -   - {{ end }} + {{ with $categoryMenu.Identifier }} +   + {{ end }} - {{ if gt $categoryCount 1 }} - {{ $categoryMenu.Name }} - {{ else }} - {{ $categoryMenu.Name | singularize }} - {{ end }} - {{ else }} - {{ $.Scratch.Set "categoryUrl" "/categories/" }} + {{ if gt $categoryCount 1 }} + {{ $categoryMenu.Name }} + {{ else }} + {{ $categoryMenu.Name | singularize }} + {{ end }} + {{ else }} + {{ $.Scratch.Set "categoryUrl" "/categories/" }} - {{ if gt $categoryCount 1 }} - Categories - {{ else }} - Category - {{ end }} - {{ end }} -
    • - {{ end }} + {{ if gt $categoryCount 1 }} + Categories + {{ else }} + Category + {{ end }} + {{ end }} + {{ end }} + {{ end }} - - {{ range .Params.categories }} -
  • {{ . }}
    • - {{ end }} + + {{ range .Params.categories }} +
  • {{ . }}
    • + {{ end }}
diff --git a/layouts/itemized/header.html b/layouts/itemized/header.html index 977f021..52f5fc1 100644 --- a/layouts/itemized/header.html +++ b/layouts/itemized/header.html @@ -1,22 +1,22 @@
-
- {{ if $.Scratch.Get "h1" }} -

{{ .Title }}

- {{ $.Scratch.Set "h1" false }} - {{ else }} -

{{ .Title }}

- {{ end }} - {{ with .Description }} -

{{ . }}

- {{ end }} -
-
+
+ {{ if $.Scratch.Get "h1" }} +

{{ .Title }}

+ {{ $.Scratch.Set "h1" false }} + {{ else }} +

{{ .Title }}

+ {{ end }} + {{ with .Description }} +

{{ . }}

+ {{ end }} +
+
- {{ .Params.author }} - {{ .Params.platform }} - {{ if isset .Params "link" }} - Link - {{ end }} - -
+ {{ .Params.author }} + {{ .Params.format }} + {{ if isset .Params "link" }} + Link + {{ end }} + +
diff --git a/layouts/itemized/single.html b/layouts/itemized/single.html index 20f53ad..a9f19af 100644 --- a/layouts/itemized/single.html +++ b/layouts/itemized/single.html @@ -1,12 +1,12 @@ {{ partial "header" . }} - {{ $.Scratch.Set "shareNav" true }} - {{ partial "navbar" . }} - {{ partial "share-menu" . }} - -
- - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -
- {{ partial "sidebar" . }} +{{ $.Scratch.Set "shareNav" true }} +{{ partial "navbar" . }} +{{ partial "share-menu" . }} + +
+ + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} +
+{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html index 47ddd20..194762c 100644 --- a/layouts/partials/favicon.html +++ b/layouts/partials/favicon.html @@ -1,18 +1,16 @@ {{ if .Site.Params.loadFavicon }} - {{ with .Site.Params.faviconVersion }} - {{ $.Scratch.Set "favVer" "-" }} - {{ $.Scratch.Add "favVer" . }} - {{ else }} - {{ $.Scratch.Set "favVer" "" }} - {{ end }} + {{ with .Site.Params.faviconVersion }} + {{ $.Scratch.Set "favVer" "-" }} + {{ $.Scratch.Add "favVer" . }} + {{ else }} + {{ $.Scratch.Set "favVer" "" }} + {{ end }} - {{ $favVer := $.Scratch.Get "favVer" }} + {{ $favVer := $.Scratch.Get "favVer" }} - - - - - + + + + + {{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 0a6d18c..e023c86 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,34 +1,34 @@ -
- - +
+ + - {{ if isset .Site.Params "customJS" }} - {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} - {{ else }} - {{ $.Scratch.Set "jsFiles" false }} - {{ end }} +{{ if isset .Site.Params "customjs" }} + {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} +{{ else }} + {{ $.Scratch.Set "jsFiles" false }} +{{ end }} - - {{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} - - - - - - - - {{ end }} + +{{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} + + + + + + + +{{ end }} - {{ if ne ($.Scratch.Get "jsFiles") false }} - {{ range $.Scratch.Get "jsFiles" }} - {{ if ne . "default" }} - - {{ end }} - {{ end }} +{{ if ne ($.Scratch.Get "jsFiles") false }} + {{ range $.Scratch.Get "jsFiles" }} + {{ if ne . "default" }} + {{ end }} + {{ end }} +{{ end }} - - - + + + diff --git a/layouts/partials/general-title.html b/layouts/partials/general-title.html index f21be7e..aac7af8 100644 --- a/layouts/partials/general-title.html +++ b/layouts/partials/general-title.html @@ -1,14 +1,14 @@ {{ $.Scratch.Set "generalTitle" .Title }} {{ if eq ($.Scratch.Get "generalTitle") "Blogs" }} - {{ $.Scratch.Set "generalTitle" "Blog" }} + {{ $.Scratch.Set "generalTitle" "Blog" }} {{ end }} {{ if and (.IsNode) (eq .Data.Plural "categories") }} - {{ if ne .Data.Plural (lower .Title) }} - {{ $.Scratch.Add "generalTitle" " Posts - " }} - {{ else }} - {{ $.Scratch.Add "generalTitle" " - " }} - {{ end }} -{{ else }} + {{ if ne .Data.Plural (lower .Title) }} + {{ $.Scratch.Add "generalTitle" " Posts - " }} + {{ else }} {{ $.Scratch.Add "generalTitle" " - " }} + {{ end }} +{{ else }} + {{ $.Scratch.Add "generalTitle" " - " }} {{ end }} {{ $.Scratch.Add "generalTitle" .Site.Title }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index c9881fa..05e7ed3 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -5,68 +5,68 @@ Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) --> - - {{ with $.Scratch.Get "generalTitle" }} - {{ . }} - {{ else }} - {{ with .Title }} - {{ . }} - {{ else }} - {{ .Site.Title }} - {{ end }} - {{ end }} + + {{ with $.Scratch.Get "generalTitle" }} + {{ . }} + {{ else }} + {{ with .Title }} + {{ . }} + {{ else }} + {{ .Site.Title }} + {{ end }} + {{ end }} - - - {{ .Hugo.Generator }} - {{ partial "favicon" . }} + + + {{ .Hugo.Generator }} + {{ partial "favicon" . }} - {{ with .Params.author }} - - {{ end }} - {{ with .Description }} - - {{ else }} - {{ with .Site.Params.description }} - - {{ end }} - {{ end }} + {{ with .Params.author }} + + {{ end }} + {{ with .Description }} + + {{ else }} + {{ with .Site.Params.description }} + + {{ end }} + {{ end }} - {{ template "_internal/twitter_cards.html" . }} - {{ template "_internal/opengraph.html" . }} - {{ template "_internal/schema.html" . }} - {{ template "_internal/google_news.html" . }} + {{ template "_internal/twitter_cards.html" . }} + {{ template "_internal/opengraph.html" . }} + {{ template "_internal/schema.html" . }} + {{ template "_internal/google_news.html" . }} - {{ if isset .Site.Params "customCSS" }} - {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }} - {{ else }} - {{ $.Scratch.Set "cssFiles" false }} - {{ end }} + {{ if isset .Site.Params "customcss" }} + {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }} + {{ else }} + {{ $.Scratch.Set "cssFiles" false }} + {{ end }} - - {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} - - - - - - - {{ end }} + + {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} + + + + + + + {{ end }} - {{ if ne ($.Scratch.Get "cssFiles") false }} - {{ range $.Scratch.Get "cssFiles" }} - {{ if ne . "default" }} - - {{ end }} - {{ end }} + {{ if ne ($.Scratch.Get "cssFiles") false }} + {{ range $.Scratch.Get "cssFiles" }} + {{ if ne . "default" }} + {{ end }} + {{ end }} + {{ end }} - {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} - {{ template "_internal/google_analytics.html" . }} - {{ end }} - - + {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} + + - -
+ +
diff --git a/layouts/partials/img-path.html b/layouts/partials/img-path.html index dabfa61..c2eccd5 100644 --- a/layouts/partials/img-path.html +++ b/layouts/partials/img-path.html @@ -1,5 +1,5 @@ @@ -68,24 +66,43 @@ - -
-
    + +
    +

    Recent Posts

    + {{ $.Scratch.Set "recentPosts" .Site.Pages }} + {{ with .Site.Params.postAmount.sidebar }} {{ $.Scratch.Set "postLimit" . }} {{ else }} {{ $.Scratch.Set "postLimit" 5 }} {{ end }} - {{ range first ($.Scratch.Get "postLimit") (where .Site.Pages "Type" "post") }} -
  • -

    {{ .Title }}

     -
    • + {{ range first ($.Scratch.Get "postLimit") (where ($.Scratch.Get "recentPosts") "Type" "post") }} +
    +
    +

    {{ .Title }}

    + {{ $.Scratch.Set "dateType" .Date }} + +
    + {{ .Render "featured" }} +
    {{ end }} -
+ + {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} + View more posts + {{ end }} +
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index a47ff0a..fd1b902 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,16 +1,22 @@ diff --git a/layouts/partials/share-links.html b/layouts/partials/share-links.html index 9d5790d..9e2ef03 100644 --- a/layouts/partials/share-links.html +++ b/layouts/partials/share-links.html @@ -1,43 +1,65 @@ -
    • + + -
    • + + -
    • + + - -
    • + + -
    • +
  • + +
    • - -
    • + + + + +
  • + +
    • -
    • + + diff --git a/layouts/partials/share-menu.html b/layouts/partials/share-menu.html index 9ecfb08..88c09aa 100644 --- a/layouts/partials/share-menu.html +++ b/layouts/partials/share-menu.html @@ -1,10 +1,10 @@
    -
    -
      -
      -

      Share this post

      -
      - {{ partial "share-links" . }} -
    -
    +
    +
      +
      +

      Share this post

      +
      + {{ partial "share-links" . }} +
    +
    diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 1d50d86..1d73998 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,134 +1,139 @@
    - - {{ with .Site.Params.intro.about }} -
    -

    About

    -

    {{ . | safeHTML }}

    + {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} + View more posts + {{ end }} +
    + - - + + + {{ if ne ($.Scratch.Get "showCategories") false }} + +
    +
    +

    + Categories +

    +
    + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.Alphabetical }} {{ end }} - - + {{ end }} -

    {{ with .Site.Copyright | safeHTML }}{{ . }}{{ else }}© {{ .Site.LastChange.Year }} {{if isset .Site.Params "author" }}{{ .Site.Params.author}}{{ else }}{{ .Site.Title }}{{ end }}{{end}}. Powered by Hugo

    -
    + + {{ with .Site.Params.intro.about }} +
    +

    About

    +

    {{ . | safeHTML }}

    + Learn More +
    + {{ end }} + + diff --git a/layouts/partials/social.html b/layouts/partials/social.html index 9b7b8f6..3a10b86 100644 --- a/layouts/partials/social.html +++ b/layouts/partials/social.html @@ -1,103 +1,133 @@ {{ with .Site.Social.github }} -
    • +
    • +{{ end }} + +{{ with .Site.Social.gitlab }} +
    • +{{ end }} + +{{ with .Site.Social.stackoverflow }} +
    • {{ end }} {{ with .Site.Social.bitbucket }} -
    • +
    • {{ end }} {{ with .Site.Social.jsfiddle }} -
    • +
    • {{ end }} {{ with .Site.Social.codepen }} -
    • +
    • +{{ end }} + +{{ with .Site.Social.deviantart }} +
    • +{{ end }} + +{{ with .Site.Social.flickr }} +
    • +{{ end }} + +{{ with .Site.Social.behance }} +
    • +{{ end }} + +{{ with .Site.Social.dribbble }} +
    • +{{ end }} + +{{ with .Site.Social.wordpress }} +
    • +{{ end }} + +{{ with .Site.Social.medium}} +
    • +{{ end }} + +{{ with .Site.Social.linkedin }} +
    • {{ end }} {{ with .Site.Social.foursquare }} -
    • +
    • {{ end }} -{{ with .Site.Social.dribbble }} -
    • +{{ with .Site.Social.xing }} +
    • {{ end }} -{{ with .Site.Social.deviantart }} -
    • +{{ with .Site.Social.slideshare }} +
    • {{ end }} -{{ with .Site.Social.behance }} -
    • +{{ with .Site.Social.facebook }} +
    • {{ end }} -{{ with .Site.Social.flickr }} -
    • +{{ with .Site.Social.googleplus }} +
    • {{ end }} -{{ with .Site.Social.instagram }} -
    • +{{ with .Site.Social.reddit }} +
    • {{ end }} {{ with .Site.Social.youtube }} -
    • +
    • {{ end }} {{ with .Site.Social.vimeo }} -
    • +
    • {{ end }} -{{ with .Site.Social.vine }} -
    • +{{ with .Site.Social.whatsapp }} +
    • {{ end }} -{{ with .Site.Social.medium}} -
    • -{{ end }} + -{{ with .Site.Social.wordpress }} -
    • +{{ with .Site.Social.wechat }} +
    • {{ end }} -{{ with .Site.Social.tumblr }} -
    • +{{ with .Site.Social.qq }} +
    • {{ end }} -{{ with .Site.Social.xing }} -
    • +{{ with .Site.Social.instagram }} +
    • {{ end }} -{{ with .Site.Social.linkedin }} -
    • +{{ with .Site.Social.tumblr }} +
    • {{ end }} -{{ with .Site.Social.slideshare }} -
    • +{{ with .Site.Social.twitter }} +
    • {{ end }} -{{ with .Site.Social.stackoverflow }} -
    • +{{ with .Site.Social.skype }} +
    • {{ end }} -{{ with .Site.Social.reddit }} -
    • +{{ with .Site.Social.snapchat }} +
    • {{ end }} {{ with .Site.Social.pinterest }} -
    • +
    • {{ end }} -{{ with .Site.Social.googleplus }} -
    • -{{ end }} - -{{ with .Site.Social.facebook }} -
    • +{{ with .Site.Social.telegram }} +
    • {{ end }} -{{ with .Site.Social.twitter }} -
    • +{{ with .Site.Social.vine }} +
    • {{ end }} {{ with .Site.Social.email }} -
    • +
    • {{ end }} diff --git a/layouts/post/comments.html b/layouts/post/comments.html index bdea945..9b993d7 100644 --- a/layouts/post/comments.html +++ b/layouts/post/comments.html @@ -1,11 +1,11 @@ {{ if ne .Site.DisqusShortname "" }} - {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} -
    - {{ template "_internal/disqus.html" . }} -
    - {{ end }} -{{ else if .Site.Params.staticman.staticman }} + {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }}
    - {{ .Render "staticman" }} + {{ template "_internal/disqus.html" . }}
    + {{ end }} +{{ else if .Site.Params.staticman.staticman }} +
    + {{ .Render "staticman" }} +
    {{ end }} diff --git a/layouts/post/content-list.html b/layouts/post/content-list.html index 32c4bcf..b051f4a 100644 --- a/layouts/post/content-list.html +++ b/layouts/post/content-list.html @@ -1,12 +1,12 @@
    - {{ .Render "header" }} - {{ .Render "featured" }} -

    {{ printf "%s" .Summary | markdownify }}

    + {{ .Render "header" }} + {{ .Render "featured" }} +

    {{ printf "%s" .Summary | markdownify }}

    - +
    diff --git a/layouts/post/content-single.html b/layouts/post/content-single.html index 9504dbe..e206134 100644 --- a/layouts/post/content-single.html +++ b/layouts/post/content-single.html @@ -1,22 +1,22 @@
    - {{ .Render "header" }} + {{ .Render "header" }} - {{ if not .Site.Params.socialShareDisabled }} + {{ if .Site.Params.socialShare }}
    -
      - {{ partial "share-links" . }} -
    +
      + {{ partial "share-links" . }} +
    - {{ end }} + {{ end }} - {{ .Render "featured" }} -
    - {{ .Content }} -
    + {{ .Render "featured" }} +
    + {{ .Content }} +
    -
    - {{ .Render "footer-category" }} -
    +
    + {{ .Render "footer-category" }} +
    {{ .Render "prev-next" }} diff --git a/layouts/post/featured.html b/layouts/post/featured.html index 7b7aa42..861bfe9 100644 --- a/layouts/post/featured.html +++ b/layouts/post/featured.html @@ -1,13 +1,13 @@ {{ if and (isset .Params "featuredpath") (ne .Params.featuredpath "") }} - {{ $.Scratch.Set "path" .Params.featuredpath }} + {{ $.Scratch.Set "path" .Params.featuredpath }} - {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }} - {{ $.Scratch.Set "structType" "page" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }} + {{ $.Scratch.Set "structType" "page" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} - - {{ .Params.featuredalt }} - - {{ end }} + + {{ .Params.featuredalt }} + + {{ end }} {{ end }} diff --git a/layouts/post/footer-category.html b/layouts/post/footer-category.html index 35d85a9..9888746 100644 --- a/layouts/post/footer-category.html +++ b/layouts/post/footer-category.html @@ -1,44 +1,46 @@ diff --git a/layouts/post/header.html b/layouts/post/header.html index e500a35..2e44285 100644 --- a/layouts/post/header.html +++ b/layouts/post/header.html @@ -1,25 +1,25 @@
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    -
    - {{ $.Scratch.Set "dateType" .Date }} +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    +
    + {{ $.Scratch.Set "dateType" .Date }} - - {{ .Params.author }} - {{ if .Site.Params.includeReadingTime }} -

    {{ .ReadingTime }} minute read

    - {{ end }} - -
    + + {{ .Params.author }} + {{ if .Site.Params.includeReadingTime }} +

    {{ .ReadingTime }} minute read

    + {{ end }} + +
    diff --git a/layouts/post/prev-next.html b/layouts/post/prev-next.html index 64b56de..6279865 100644 --- a/layouts/post/prev-next.html +++ b/layouts/post/prev-next.html @@ -1,11 +1,13 @@ diff --git a/layouts/post/single.html b/layouts/post/single.html index 20f53ad..a9f19af 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,12 +1,12 @@ {{ partial "header" . }} - {{ $.Scratch.Set "shareNav" true }} - {{ partial "navbar" . }} - {{ partial "share-menu" . }} - -
    - - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -
    - {{ partial "sidebar" . }} +{{ $.Scratch.Set "shareNav" true }} +{{ partial "navbar" . }} +{{ partial "share-menu" . }} + +
    + + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} +
    +{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/post/staticman.html b/layouts/post/staticman.html index 955846b..4c5964e 100644 --- a/layouts/post/staticman.html +++ b/layouts/post/staticman.html @@ -40,7 +40,7 @@
    {{ end }} -{{ end }} + {{ end }} {{ end }} {{ if eq ($.Scratch.Get "hasComments") 0 }} diff --git a/layouts/shortcodes/img-fit.html b/layouts/shortcodes/img-fit.html index 08e8224..b8603d2 100644 --- a/layouts/shortcodes/img-fit.html +++ b/layouts/shortcodes/img-fit.html @@ -39,37 +39,37 @@ --> {{ $numOfParams := sub (len .Params) 1 }} {{ if and (ge $numOfParams 3) (not (modBool $numOfParams 2)) }} - {{ $.Scratch.Set "path" (.Get $numOfParams) }} + {{ $.Scratch.Set "path" (.Get $numOfParams) }} - {{ $.Scratch.Set "structType" "shortcode" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ $.Scratch.Set "structType" "shortcode" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} -
    -
    - {{ $.Scratch.Set "count" 1 }} - {{ $.Scratch.Set "imgFile" "" }} - {{ range first $numOfParams .Params }} - {{ if eq ($.Scratch.Get "count") 1 }} -
    - {{ else if eq ($.Scratch.Get "count") 2 }} - {{ if eq . "" }} -
    - {{ $.Scratch.Set "imgFile" "" }} - {{ else }} - {{ $.Scratch.Set "imgFile" . }} - - {{ end }} - {{ else }} - {{ if ne ($.Scratch.Get "imgFile") "" }} - {{ . }} -
    - {{ end }} - {{ $.Scratch.Set "count" 0 }} - {{ end }} - {{ $.Scratch.Add "count" 1 }} +
    +
    + {{ $.Scratch.Set "count" 1 }} + {{ $.Scratch.Set "imgFile" "" }} + {{ range first $numOfParams .Params }} + {{ if eq ($.Scratch.Get "count") 1 }} +
    + {{ else if eq ($.Scratch.Get "count") 2 }} + {{ if eq . "" }} +
    + {{ $.Scratch.Set "imgFile" "" }} + {{ else }} + {{ $.Scratch.Set "imgFile" . }} + {{ end }} -
    + {{ else }} + {{ if ne ($.Scratch.Get "imgFile") "" }} + {{ . }} + +
    + {{ end }} + {{ $.Scratch.Set "count" 0 }} + {{ end }} + {{ $.Scratch.Add "count" 1 }} + {{ end }}
    + {{ end }} diff --git a/layouts/shortcodes/img-post.html b/layouts/shortcodes/img-post.html index 6143696..6749f96 100644 --- a/layouts/shortcodes/img-post.html +++ b/layouts/shortcodes/img-post.html @@ -22,47 +22,49 @@ --> {{ $numOfParams := len .Params }} {{ if and (ge $numOfParams 2) (le $numOfParams 4) }} - - {{ if .IsNamedParams }} - {{ $.Scratch.Set "path" (.Get "path") }} - {{ $.Scratch.Set "file" (.Get "file") }} - {{ $.Scratch.Set "alt" (.Get "alt") }} - {{ $.Scratch.Set "type" (.Get "type") }} + + {{ if .IsNamedParams }} + {{ $.Scratch.Set "path" (.Get "path") }} + {{ $.Scratch.Set "file" (.Get "file") }} + {{ $.Scratch.Set "alt" (.Get "alt") }} + {{ $.Scratch.Set "type" (.Get "type") }} + {{ else }} + {{ $.Scratch.Set "path" (.Get 0) }} + {{ $.Scratch.Set "file" (.Get 1) }} + {{ if ge $numOfParams 3 }} + {{ $.Scratch.Set "alt" (.Get 2) }} {{ else }} - {{ $.Scratch.Set "path" (.Get 0) }} - {{ $.Scratch.Set "file" (.Get 1) }} - {{ if ge $numOfParams 3 }} - {{ $.Scratch.Set "alt" (.Get 2) }} - {{ else }} - {{ $.Scratch.Set "alt" "" }} - {{ end }} - {{ if ge $numOfParams 4 }} - {{ $.Scratch.Set "type" (.Get 3) }} - {{ else }} - {{ $.Scratch.Set "type" "center" }} - {{ end }} + {{ $.Scratch.Set "alt" "" }} {{ end }} + {{ if ge $numOfParams 4 }} + {{ $.Scratch.Set "type" (.Get 3) }} + {{ else }} + {{ $.Scratch.Set "type" "center" }} + {{ end }} + {{ end }} - {{ $file := $.Scratch.Get "file" }} - {{ $type := $.Scratch.Get "type" }} - {{ $alt := $.Scratch.Get "alt" }} + {{ $file := $.Scratch.Get "file" }} + {{ $type := $.Scratch.Get "type" }} + {{ $alt := $.Scratch.Get "alt" }} - {{ $.Scratch.Set "structType" "shortcode" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ $.Scratch.Set "structType" "shortcode" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} - {{ if eq $type "left" }} - - {{ $alt }} - - {{ else if eq $type "right" }} - - {{ $alt }} - - {{ else }} -

    - {{ $alt }} -

    - {{ end }} + {{ if eq $type "left" }} + + {{ $alt }} + + {{ else if eq $type "right" }} + + {{ $alt }} + + {{ else }} +

    + + {{ $alt }} + +

    + {{ end }} {{ end }} diff --git a/layouts/shortcodes/url-link.html b/layouts/shortcodes/url-link.html index 419c098..c2b5f5e 100644 --- a/layouts/shortcodes/url-link.html +++ b/layouts/shortcodes/url-link.html @@ -1,10 +1,10 @@ {{ $numOfParams := len .Params }} {{ if and (ge $numOfParams 2) (le $numOfParams 3) }} - {{ if eq $numOfParams 3 }} - {{ $.Scratch.Set "target" (.Get 2) }} - {{ else }} - {{ $.Scratch.Set "target" "_blank" }} - {{ end }} + {{ if eq $numOfParams 3 }} + {{ $.Scratch.Set "target" (.Get 2) }} + {{ else }} + {{ $.Scratch.Set "target" "_blank" }} + {{ end }} - {{ .Get 0 }} + {{ .Get 0 }} {{ end }} diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html index 8881b14..0fd749f 100644 --- a/layouts/taxonomy/category.html +++ b/layouts/taxonomy/category.html @@ -1,16 +1,16 @@ {{ partial "general-title" . }} {{ partial "header" . }} - {{ partial "navbar" . }} - -
    -

    {{ .Title }}

    - {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} - {{ range $paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} +{{ partial "navbar" . }} + +
    +

    {{ .Title }}

    + {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} + {{ range $paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -
    - {{ partial "sidebar" . }} + {{ partial "pagination" . }} +
    +{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html index 5e504c0..9affa3a 100644 --- a/layouts/taxonomy/category.terms.html +++ b/layouts/taxonomy/category.terms.html @@ -1,33 +1,33 @@ {{ partial "general-title" . }} {{ partial "header" . }} - {{ partial "navbar" . }} - -
    - {{ if .Site.Params.categoriesByCount }} - {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} - {{ else }} - {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} - {{ end }} +{{ partial "navbar" . }} + +
    + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} + {{ end }} -
      -
      -

      {{ .Data.Plural }}

      -
      - {{ $data := .Data }} - {{ range $key, $value := $.Scratch.Get "categories" }} -
    • - -
      • - {{ end }} -
    -
    + +
    - {{ $.Scratch.Set "showCategories" false }} - {{ partial "sidebar" . }} +{{ $.Scratch.Set "showCategories" false }} +{{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/static/css/add-on.css b/static/css/add-on.css deleted file mode 100644 index b51259a..0000000 --- a/static/css/add-on.css +++ /dev/null @@ -1,6 +0,0 @@ -/* - This css file is for individual users to restyle items for their personal site, - or for the implementation of features specifically for their site. Anything that - is an official part of the theme (ex. Pull Requests) should be included in main.css - within the formating given. -*/ diff --git a/static/css/main.css b/static/css/main.css index b949545..00f8dbd 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -307,9 +307,9 @@ text-align: right; } -/* Author */ +/* Author and Format */ - .author { + .author, .format { display: -moz-flex; display: -webkit-flex; display: -ms-flex; @@ -335,7 +335,7 @@ white-space: nowrap; } - .author .name { + .author .name, .format .name { -moz-transition: border-bottom-color 0.2s ease; -webkit-transition: border-bottom-color 0.2s ease; -ms-transition: border-bottom-color 0.2s ease; @@ -345,31 +345,16 @@ margin: 0 1.5em 0 0; } - .author img { + .author img, .format img { border-radius: 100%; display: block; width: 4em; } - .author:hover .name { + .author:hover .name, .format:hover .name { border-bottom-color: transparent; } -/* Blurb */ - - .blurb h2 { - font-size: 0.8em; - margin: 0 0 1.5em 0; - } - - .blurb h3 { - font-size: 0.7em; - } - - .blurb p { - font-size: 0.9em; - } - /* Box */ .box { @@ -1200,6 +1185,10 @@ transform: scale(1.05); } + .mini-post .image.featured { + margin: 0; + } + .mini-post header { padding: 1.25em 4.25em 0.1em 1.25em ; min-height: 4em; @@ -1224,7 +1213,7 @@ text-transform: uppercase; } - .mini-post header .author { + .mini-post header .author, .mini-post header .format { position: absolute; right: 2em; top: 2em; @@ -1236,7 +1225,7 @@ @media screen and (max-width: 1280px) { - .mini-posts { + .mini-posts .posts-container { display: -moz-flex; display: -webkit-flex; display: -ms-flex; @@ -1245,28 +1234,31 @@ -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; - width: calc(100% + 2em); + justify-content: space-between; + width: 100%; } - .mini-posts > * { - margin: 2em 2em 0 0; - width: calc(50% - 2em); - } - - .mini-posts > :nth-child(-n + 2) { + .mini-posts .posts-container > * { + margin: 2em 0 0 0; + width: 24%; margin-top: 0; } } - @media screen and (max-width: 480px) { + @media screen and (max-width: 800px) { - .mini-posts { - display: block; - width: 100%; + + .mini-posts .posts-container > * { + margin: 0 0 2em 0; + width: 49%; } - .mini-posts > * { + } + + @media screen and (max-width: 480px) { + + .mini-posts .posts-container > * { margin: 0 0 2em 0; width: 100%; } @@ -1800,7 +1792,8 @@ margin-top: 0; } - .itemized > header .meta .author { + .itemized > header .meta .author, + .itemized > header .meta .format, { -moz-flex-direction: row-reverse; -webkit-flex-direction: row-reverse; -ms-flex-direction: row-reverse; @@ -1808,12 +1801,14 @@ margin-bottom: 0; } - .itemized > header .meta .author .name { + .itemized > header .meta .author .name, + .itemized > header .meta .format .name { margin: 0 0 0 1.5em; } - .itemized > header .meta .author img { + .itemized > header .meta .author img, + .itemized > header .meta .format img { width: 3.5em; } @@ -1965,6 +1960,7 @@ table > thead > tr > td, table > tbody > tr > td, table > tfoot > tr > td { + vertical-align: middle; padding: 0.5em; -webkit-transition: all 0.3s ease; -o-transition: all 0.3s ease; @@ -2220,7 +2216,6 @@ line-height: inherit; padding: 0 0 0 1.5em; white-space: nowrap; - min-width: 12.4em; } #header h1 a { @@ -2395,6 +2390,14 @@ padding: 0 0.5em 0 0; } + @media screen and (min-width: 1280px) { + + #header .menu { + display: none; + } + + } + @media screen and (max-width: 980px) { #header .links { @@ -2508,9 +2511,7 @@ padding-top: 0; } - #sidebar #recent-posts ul.posts time, - #sidebar #categories ul.posts li header, - #sidebar .blurb p { + #sidebar #mini-bio p { /* Theoretically for IE 8 & 9 (more valid) */ /* ...but not required as filter works too */ /* should come BEFORE filter */ @@ -2522,6 +2523,8 @@ /* Modern Browsers */ opacity: 0.65; + font-size: 0.9em; + padding: 0; } @media screen and (max-width: 1280px) { @@ -2649,6 +2652,7 @@ } #footer .copyright { + text-align: center; color: #aaaaaa; font-family: "Raleway", Helvetica, sans-serif; font-size: 0.5em; @@ -2835,14 +2839,16 @@ .share-btn.facebook { background: #3B5998; } .share-btn.linkedin { background: #4875B4; } .share-btn.stumbleupon { background: #EB4823; } + .share-btn.pinterest { background: #BD081C; } .share-btn.reddit { background: #ff5700; } .share-btn.email { background: #444444; } - .share-btn.twitter:hover { background: #4c9ad6 } + .share-btn.twitter:hover { background: #4c9ad6; } .share-btn.google-plus:hover { background: #c64333; } .share-btn.facebook:hover { background: #2f4779; } .share-btn.linkedin:hover { background: #4069a2; } .share-btn.stumbleupon:hover { background: #d3401f; } + .share-btn.pinterest:hover { background: #AD0000; } .share-btn.reddit:hover { background: #e54e00; } .share-btn.email:hover { background: #363636; } diff --git a/theme.toml b/theme.toml index f2cac70..e791a5c 100644 --- a/theme.toml +++ b/theme.toml @@ -4,9 +4,9 @@ name = "Hugo Future Imperfect" license = "MIT" licenselink = "https://github.com/jpescador/hugo-future-imperfect/blob/master/LICENSE.md" -description = "Ported theme of HTML5 UP, future imperfect, with some extra goodies" +description = "HTML5 UP's Future Imperfect ported to Hugo with some extra goodies." homepage = "https://github.com/jpescador/hugo-future-imperfect" -tags = ["blog", "responsive", "font awesome", "highlight.js", "fancybox 3", "staticman", "netlify"] +tags = ["blog", "responsive", "font awesome", "highlight.js", "fancybox 3", "staticman", "netlify", "disqus"] features = ["html5", "css3", "responsive"] min_version = 0.15 -- cgit v1.2.3 From 3e538735e24e23b6fb5f73319d97be658fb5d884 Mon Sep 17 00:00:00 2001 From: pacollins Date: Thu, 28 Sep 2017 11:43:07 -0400 Subject: Revert "Update Theme" This reverts commit f0415e77aa1b0c17cb7adff3e7367d6c7d19bb8c. --- archetypes/itemized.md | 2 +- exampleSite/config.toml | 117 +++++++--------- exampleSite/static/css/add-on.css | 6 - exampleSite/static/js/add-on.js | 0 layouts/_default/header.html | 22 +-- layouts/_default/list.html | 20 +-- layouts/_default/single.html | 22 +-- layouts/about/list.html | 22 +-- layouts/contact/list.html | 86 ++++++------ layouts/index.html | 20 +-- layouts/itemized/content-list.html | 2 +- layouts/itemized/content-single.html | 28 ++-- layouts/itemized/footer-category.html | 70 +++++----- layouts/itemized/header.html | 38 +++--- layouts/itemized/single.html | 20 +-- layouts/partials/favicon.html | 26 ++-- layouts/partials/footer.html | 56 ++++---- layouts/partials/general-title.html | 14 +- layouts/partials/header.html | 112 +++++++-------- layouts/partials/img-path.html | 28 ++-- layouts/partials/navbar.html | 111 +++++++-------- layouts/partials/pagination.html | 30 ++--- layouts/partials/share-links.html | 58 +++----- layouts/partials/share-menu.html | 16 +-- layouts/partials/sidebar.html | 247 +++++++++++++++++----------------- layouts/partials/social.html | 122 +++++++---------- layouts/post/comments.html | 14 +- layouts/post/content-list.html | 18 +-- layouts/post/content-single.html | 26 ++-- layouts/post/featured.html | 18 +-- layouts/post/footer-category.html | 70 +++++----- layouts/post/header.html | 44 +++--- layouts/post/prev-next.html | 18 ++- layouts/post/single.html | 20 +-- layouts/post/staticman.html | 2 +- layouts/shortcodes/img-fit.html | 58 ++++---- layouts/shortcodes/img-post.html | 78 ++++++----- layouts/shortcodes/url-link.html | 12 +- layouts/taxonomy/category.html | 22 +-- layouts/taxonomy/category.terms.html | 54 ++++---- static/css/add-on.css | 6 + static/css/main.css | 90 ++++++------- theme.toml | 4 +- 43 files changed, 874 insertions(+), 975 deletions(-) delete mode 100644 exampleSite/static/css/add-on.css delete mode 100644 exampleSite/static/js/add-on.js create mode 100644 static/css/add-on.css diff --git a/archetypes/itemized.md b/archetypes/itemized.md index 2bda772..4479926 100644 --- a/archetypes/itemized.md +++ b/archetypes/itemized.md @@ -8,7 +8,7 @@ featuredalt = "" featuredpath = "" link = "" linktitle = "" -format = "" +platform = "" title = "" type = "itemized" diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 35e18d4..c32c7d9 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -9,55 +9,51 @@ googleAnalytics = "" pluralizeListTitles = false [params] - # Sets the meta tag description + # Sets the meta tag description, usually reserved for the main page description = "HTML5 UP theme, Future Imperfect with some extra goodies, ported by Julio Pescador. Powered by Hugo" - # Sets the navbarTitle that appears in the top left of the navigation bar + # This will appear on the top left of the navigation bar navbarTitle = "Future Imperfect" - # Sets where "View More Posts" links + # set this to the section name if section is not post viewMorePostLink = "/blog/" # Optional Params - # Sets navbarTitle to match the section of the website + # This will match the navbarTitle to the section of the website dynamicTitles = true - # Sets RSS icons to appear on the sidebar with the social media buttons + # RSS icon that appear on the sidebar, next to the social media buttons rssAppearAtTop = true rssAppearAtBottom = true - # Sets Social Media icons to appear on the sidebar + # Social media buttons that appear on the sidebar socialAppearAtTop = true socialAppearAtBottom = true - # Sets Categories to sort by number of posts instead of alphabetical categoriesByCount = true - # Sets Estimated Reading Time to appear in post headers includeReadingTime = true - # Sets the Favicon and Version for the site. Default support is for - # apple-touch-icon-precomposed.png, favicon.png, favicon.ico, and mstile.png. - # These are stored in the favicon folder. See the following for more information: + # The set of favicons used are based on the write-up from this link: # https://github.com/audreyr/favicon-cheat-sheet + # Please see the favicon partial template for more information loadFavicon = false faviconVersion = "" - # Sets Social Share links to appear on posts - socialShare = true + + # Disable showing the social sharing links on blog posts + socialShareDisabled = false + # Load custom CSS or JavaScript files. The variable is an array so that you # can load multiple files if necessary. You can also load the standard theme # files by adding the value, "default". # customCSS = ["default", "/path/to/file"] # customJS = ["default", "/path/to/file"] + customCSS = ["default"] customJS = ["default"] -# Disqus will take priority over Staticman (github.com/eduardoboucas/staticman) -# due to its ease of use. Feel free to check out both and decide what you would -# prefer to use. See Staticman.yml for additional settings. +# Disqus will take priority over staticman due to its ease of use. Feel free to check out both and decide. [params.staticman] - # Sets Statiman to be active staticman = false - # Sets the location for Staticman to connect to username = "" repo = "" branch = "" -# These are optional params related to the sidebar. They are recommended, but not -# required for proper functionality. HTML is supported within the params. +# parms.intro will appear on the sidebar +# This is optional, but it's suggested to use [params.intro] header = "Hugo Future Imperfect" @@ -65,23 +61,26 @@ pluralizeListTitles = false about = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent tellus lacus, auctor vehicula molestie quis, tempor quis velit. Quisque in quam ac leo efficitur vulputate. Phasellus ullamcorper aliquam sodales. Maecenas sit amet condimentum ipsum. Proin sit amet ligula elit. Mauris." - # This appears at the top of the sidebar above params.intro.header. - # A width of less than 100px is recommended from a design perspective. - [params.intro.pic] - src = "/img/main/logo.jpg" - # Sets Image to be a cirlce - circle = false - # Sets Image to be Future Imperfect's hexagon - imperfect = true - width = "" - alt = "Hugo Future Imperfect" +# This will also appear on the sidebar. +# A width of less than 100px is recommended +# This is optional +[params.intro.pic] + src = "/img/main/logo.jpg" + # modify your picture in the shape of a circle or + # future imperfect's hexagonal shape + circle = false + imperfect = true + width = "" + alt = "Hugo Future Imperfect" +# Adjust the amount of recent posts on the sidebar. +# This is optional. The default value 5 will be used [params.postAmount] -# Sets the number of recent posts to show in the sidebar. The default value is 5. - sidebar = 5 + sidebar = 2 + +# Set up your menu items in the navigation bar +# You can use identifier to prepend a font awesome icon to your text -# Sets the menu items in the navigation bar -# Identifier prepends a Font Awesome icon to the menu item [[menu.main]] name = "Home" url = "/" @@ -118,47 +117,35 @@ pluralizeListTitles = false identifier = "fa fa-envelope-o" weight = 6 -# Sets Social Media icons to appear and link to your account. Value should be your -# username unless otherwise noted. These are the icons affected by socialAppearAtTop -# and socialAppearAtBottom. +# Insert your username and the icon will apear on the page as long as +# socialAppearAtTop or socialAppearAtBottom is set to true in the params area +# The social media icons will appear on the sidebar [social] - # Coding Communities github = "jpescador" - gitlab = "" - stackoverflow = "" # User Number bitbucket = "" jsfiddle = "" codepen = "" - # Visual Art Communities + foursquare = "" + dribbble = "" deviantart = "" - flickr = "" behance = "" - dribbble = "" - # Publishing Communities - wordpress = "" + flickr = "" + instagram = "" + youtube = "" + vimeo = "" + vine = "" medium = "" - # Professional/Business Oriented Communities - linkedin = "" - foursquare = "" + wordpress = "" + tumblr = "" xing = "" + linkedin = "" slideshare = "" - # Social Networks - facebook = "" - googleplus = "" + stackoverflow = "" reddit = "" - youtube = "" - vimeo = "" - whatsapp = "" # WhatsApp Number - # WeChat and QQ need testing. - wechat = "" - qq = "" # User ID Number - instagram = "" - tumblr = "" - twitter = "julio_pescador" - skype = "" - snapchat = "" pinterest = "" - telegram = "" - vine = "" - # Email + googleplus = "" + facebook = "" + facebook_admin = "" + twitter_domain = "" + twitter = "julio_pescador" email = "" diff --git a/exampleSite/static/css/add-on.css b/exampleSite/static/css/add-on.css deleted file mode 100644 index b51259a..0000000 --- a/exampleSite/static/css/add-on.css +++ /dev/null @@ -1,6 +0,0 @@ -/* - This css file is for individual users to restyle items for their personal site, - or for the implementation of features specifically for their site. Anything that - is an official part of the theme (ex. Pull Requests) should be included in main.css - within the formating given. -*/ diff --git a/exampleSite/static/js/add-on.js b/exampleSite/static/js/add-on.js deleted file mode 100644 index e69de29..0000000 diff --git a/layouts/_default/header.html b/layouts/_default/header.html index 92b0dc1..f7184e7 100644 --- a/layouts/_default/header.html +++ b/layouts/_default/header.html @@ -1,13 +1,13 @@
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9a8d157..9eaffcc 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,15 +1,15 @@ {{ partial "general-title" . }} {{ partial "header" . }} -{{ partial "navbar" . }} - -
    - {{ $paginator := .Paginate .Data.Pages }} - {{ range .Paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} + {{ partial "navbar" . }} + +
    + {{ $paginator := .Paginate .Data.Pages }} + {{ range .Paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -
    -{{ partial "sidebar" . }} + {{ partial "pagination" . }} +
    + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d94cf5a..d0160bc 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,16 +1,16 @@ {{ partial "general-title" . }} {{ partial "header" . }} -{{ partial "navbar" . }} - -
    -
    - {{ $.Scratch.Set "h1" true }} - {{ .Render "header" }} -
    - {{ .Content }} + {{ partial "navbar" . }} + +
    +
    + {{ $.Scratch.Set "h1" true }} + {{ .Render "header" }} +
    + {{ .Content }} +
    +
    -
    -
    -{{ partial "sidebar" . }} + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/about/list.html b/layouts/about/list.html index d490e3d..e821afd 100644 --- a/layouts/about/list.html +++ b/layouts/about/list.html @@ -6,17 +6,17 @@
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    {{ .Content }} diff --git a/layouts/contact/list.html b/layouts/contact/list.html index a585a4b..cc2f35b 100644 --- a/layouts/contact/list.html +++ b/layouts/contact/list.html @@ -1,48 +1,48 @@ {{ partial "general-title" . }} {{ partial "header" . }} -{{ partial "navbar" . }} - -
    -
    -
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    -
    -
    - {{ .Content }} -
    - {{ if .Params.netlify }} -
    - {{ else }} - - {{ end }} -

    Replies Typically Within 24 Hours.

    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    + {{ partial "navbar" . }} + +
    +
    +
    +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    +
    +
    + {{ .Content }} +
    + {{ if .Params.netlify }} +
    + {{ else }} + + {{ end }} +

    Replies Typically Within 24 Hours.

    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    -
    -
    -{{ partial "sidebar" . }} + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/index.html b/layouts/index.html index d5bc1a6..be5f8da 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,13 +1,13 @@ {{ partial "header" . }} -{{ $.Scratch.Set "shareNav" true }} -{{ partial "navbar" . }} - -
    - {{ range first 4 (where .Site.Pages "Type" "post") }} - {{ .Render "content-list" }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + +
    + {{ range first 1 (where .Site.Pages "Type" "post") }} + {{ .Render "content-single" }} - {{ partial "share-menu" . }} - {{ end }} -
    -{{ partial "sidebar" . }} + {{ partial "share-menu" . }} + {{ end }} +
    + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/itemized/content-list.html b/layouts/itemized/content-list.html index 703baa9..ae5be37 100644 --- a/layouts/itemized/content-list.html +++ b/layouts/itemized/content-list.html @@ -1,3 +1,3 @@
    - {{ .Render "header" }} + {{ .Render "header" }}
    diff --git a/layouts/itemized/content-single.html b/layouts/itemized/content-single.html index b047740..4c3a2b0 100644 --- a/layouts/itemized/content-single.html +++ b/layouts/itemized/content-single.html @@ -1,21 +1,23 @@
    - {{ .Render "header" }} + {{ .Render "header" }} - {{ if .Site.Params.socialShare }} + {{ if not .Site.Params.socialShareDisabled }}
    -
      - {{ partial "share-links" . }} -
    +
      + {{ partial "share-links" . }} +
    - {{ end }} + {{ end }} - {{ .Render "featured" }} -
    - {{ .Content }} -
    + {{ .Render "featured" }} +
    + {{ .Content }} +
    -
    - {{ .Render "footer-category" }} -
    +
    + {{ .Render "footer-category" }} +
    {{ .Render "prev-next" }} + +{{ partials "comments" }} diff --git a/layouts/itemized/footer-category.html b/layouts/itemized/footer-category.html index 47a4308..35d85a9 100644 --- a/layouts/itemized/footer-category.html +++ b/layouts/itemized/footer-category.html @@ -1,44 +1,44 @@
      - {{ if isset .Params "categories" }} - {{ $categoryCount := (len .Params.categories) }} + {{ if isset .Params "categories" }} + {{ $categoryCount := (len .Params.categories) }} - - {{ if ge $categoryCount 1 }} -
    • - {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} - {{ if ne (len $categoryMenu) 0 }} - {{ $categoryMenu := index $categoryMenu 0 }} + + {{ if ge $categoryCount 1 }} +
    • + {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} + {{ if ne (len $categoryMenu) 0 }} + {{ $categoryMenu := index $categoryMenu 0 }} - {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} + {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} - {{ with $categoryMenu.Identifier }} -   - {{ end }} + {{ with $categoryMenu.Identifier }} +   + {{ end }} - {{ if gt $categoryCount 1 }} - {{ $categoryMenu.Name }} - {{ else }} - {{ $categoryMenu.Name | singularize }} - {{ end }} - {{ else }} - {{ $.Scratch.Set "categoryUrl" "/categories/" }} + {{ if gt $categoryCount 1 }} + {{ $categoryMenu.Name }} + {{ else }} + {{ $categoryMenu.Name | singularize }} + {{ end }} + {{ else }} + {{ $.Scratch.Set "categoryUrl" "/categories/" }} - {{ if gt $categoryCount 1 }} - Categories - {{ else }} - Category - {{ end }} - {{ end }} -
      • + {{ if gt $categoryCount 1 }} + Categories + {{ else }} + Category + {{ end }} + {{ end }} + + {{ end }} {{ end }} - {{ end }} - - {{ range .Params.categories }} -
    • {{ . }}
      • - {{ end }} + + {{ range .Params.categories }} +
    • {{ . }}
      • + {{ end }}
    diff --git a/layouts/itemized/header.html b/layouts/itemized/header.html index 52f5fc1..977f021 100644 --- a/layouts/itemized/header.html +++ b/layouts/itemized/header.html @@ -1,22 +1,22 @@
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    -
    +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    +
    - {{ .Params.author }} - {{ .Params.format }} - {{ if isset .Params "link" }} - Link - {{ end }} - -
    + {{ .Params.author }} + {{ .Params.platform }} + {{ if isset .Params "link" }} + Link + {{ end }} + +
    diff --git a/layouts/itemized/single.html b/layouts/itemized/single.html index a9f19af..20f53ad 100644 --- a/layouts/itemized/single.html +++ b/layouts/itemized/single.html @@ -1,12 +1,12 @@ {{ partial "header" . }} -{{ $.Scratch.Set "shareNav" true }} -{{ partial "navbar" . }} -{{ partial "share-menu" . }} - -
    - - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -
    -{{ partial "sidebar" . }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + {{ partial "share-menu" . }} + +
    + + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} +
    + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html index 194762c..47ddd20 100644 --- a/layouts/partials/favicon.html +++ b/layouts/partials/favicon.html @@ -1,16 +1,18 @@ {{ if .Site.Params.loadFavicon }} - {{ with .Site.Params.faviconVersion }} - {{ $.Scratch.Set "favVer" "-" }} - {{ $.Scratch.Add "favVer" . }} - {{ else }} - {{ $.Scratch.Set "favVer" "" }} - {{ end }} + {{ with .Site.Params.faviconVersion }} + {{ $.Scratch.Set "favVer" "-" }} + {{ $.Scratch.Add "favVer" . }} + {{ else }} + {{ $.Scratch.Set "favVer" "" }} + {{ end }} - {{ $favVer := $.Scratch.Get "favVer" }} + {{ $favVer := $.Scratch.Get "favVer" }} - - - - - + + + + + {{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index e023c86..0a6d18c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,34 +1,34 @@ -
    - - +
    + + -{{ if isset .Site.Params "customjs" }} - {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} -{{ else }} - {{ $.Scratch.Set "jsFiles" false }} -{{ end }} + {{ if isset .Site.Params "customJS" }} + {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} + {{ else }} + {{ $.Scratch.Set "jsFiles" false }} + {{ end }} - -{{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} - - - - - - - -{{ end }} + + {{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} + + + + + + + + {{ end }} -{{ if ne ($.Scratch.Get "jsFiles") false }} - {{ range $.Scratch.Get "jsFiles" }} - {{ if ne . "default" }} - + {{ if ne ($.Scratch.Get "jsFiles") false }} + {{ range $.Scratch.Get "jsFiles" }} + {{ if ne . "default" }} + + {{ end }} + {{ end }} {{ end }} - {{ end }} -{{ end }} - - - + + + diff --git a/layouts/partials/general-title.html b/layouts/partials/general-title.html index aac7af8..f21be7e 100644 --- a/layouts/partials/general-title.html +++ b/layouts/partials/general-title.html @@ -1,14 +1,14 @@ {{ $.Scratch.Set "generalTitle" .Title }} {{ if eq ($.Scratch.Get "generalTitle") "Blogs" }} - {{ $.Scratch.Set "generalTitle" "Blog" }} + {{ $.Scratch.Set "generalTitle" "Blog" }} {{ end }} {{ if and (.IsNode) (eq .Data.Plural "categories") }} - {{ if ne .Data.Plural (lower .Title) }} - {{ $.Scratch.Add "generalTitle" " Posts - " }} - {{ else }} - {{ $.Scratch.Add "generalTitle" " - " }} - {{ end }} + {{ if ne .Data.Plural (lower .Title) }} + {{ $.Scratch.Add "generalTitle" " Posts - " }} + {{ else }} + {{ $.Scratch.Add "generalTitle" " - " }} + {{ end }} {{ else }} - {{ $.Scratch.Add "generalTitle" " - " }} + {{ $.Scratch.Add "generalTitle" " - " }} {{ end }} {{ $.Scratch.Add "generalTitle" .Site.Title }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 05e7ed3..c9881fa 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -5,68 +5,68 @@ Free for personal and commercial use under the CCA 3.0 license (html5up.net/license) --> - - {{ with $.Scratch.Get "generalTitle" }} - {{ . }} - {{ else }} - {{ with .Title }} - {{ . }} - {{ else }} - {{ .Site.Title }} - {{ end }} - {{ end }} + + {{ with $.Scratch.Get "generalTitle" }} + {{ . }} + {{ else }} + {{ with .Title }} + {{ . }} + {{ else }} + {{ .Site.Title }} + {{ end }} + {{ end }} - - - {{ .Hugo.Generator }} - {{ partial "favicon" . }} + + + {{ .Hugo.Generator }} + {{ partial "favicon" . }} - {{ with .Params.author }} - - {{ end }} - {{ with .Description }} - - {{ else }} - {{ with .Site.Params.description }} - - {{ end }} - {{ end }} + {{ with .Params.author }} + + {{ end }} + {{ with .Description }} + + {{ else }} + {{ with .Site.Params.description }} + + {{ end }} + {{ end }} - {{ template "_internal/twitter_cards.html" . }} - {{ template "_internal/opengraph.html" . }} - {{ template "_internal/schema.html" . }} - {{ template "_internal/google_news.html" . }} + {{ template "_internal/twitter_cards.html" . }} + {{ template "_internal/opengraph.html" . }} + {{ template "_internal/schema.html" . }} + {{ template "_internal/google_news.html" . }} - {{ if isset .Site.Params "customcss" }} - {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }} - {{ else }} - {{ $.Scratch.Set "cssFiles" false }} - {{ end }} + {{ if isset .Site.Params "customCSS" }} + {{ $.Scratch.Set "cssFiles" .Site.Params.customCSS }} + {{ else }} + {{ $.Scratch.Set "cssFiles" false }} + {{ end }} - - {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} - - - - - - - {{ end }} + + {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} + + + + + + + {{ end }} - {{ if ne ($.Scratch.Get "cssFiles") false }} - {{ range $.Scratch.Get "cssFiles" }} - {{ if ne . "default" }} - + {{ if ne ($.Scratch.Get "cssFiles") false }} + {{ range $.Scratch.Get "cssFiles" }} + {{ if ne . "default" }} + + {{ end }} + {{ end }} {{ end }} - {{ end }} - {{ end }} - {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} - {{ template "_internal/google_analytics.html" . }} - {{ end }} - - + {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} + + - -
    + +
    diff --git a/layouts/partials/img-path.html b/layouts/partials/img-path.html index c2eccd5..dabfa61 100644 --- a/layouts/partials/img-path.html +++ b/layouts/partials/img-path.html @@ -1,5 +1,5 @@ @@ -66,43 +68,24 @@ - -
    -
    + +
    +

      Recent Posts

      - {{ $.Scratch.Set "recentPosts" .Site.Pages }} - {{ with .Site.Params.postAmount.sidebar }} {{ $.Scratch.Set "postLimit" . }} {{ else }} {{ $.Scratch.Set "postLimit" 5 }} {{ end }} - {{ range first ($.Scratch.Get "postLimit") (where ($.Scratch.Get "recentPosts") "Type" "post") }} -
      -
      -

      {{ .Title }}

      - {{ $.Scratch.Set "dateType" .Date }} - -
      - {{ .Render "featured" }} -
      - {{ end }} - - {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} - View more posts + {{ range first ($.Scratch.Get "postLimit") (where .Site.Pages "Type" "post") }} +
    • +

      {{ .Title }}

       +
      • {{ end }} -
    +
    diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index fd1b902..a47ff0a 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,22 +1,16 @@ diff --git a/layouts/partials/share-links.html b/layouts/partials/share-links.html index 9e2ef03..9d5790d 100644 --- a/layouts/partials/share-links.html +++ b/layouts/partials/share-links.html @@ -1,65 +1,43 @@ -
  • -
  • -
    • + -
  • -
  • -
    • + -
  • -
  • -
    • + - -
  • -
  • -
    • + -
  • - -
    • +
    • - -
  • -
  • -
    • - - -
  • - -
    • + -
  • -
  • -
    • + diff --git a/layouts/partials/share-menu.html b/layouts/partials/share-menu.html index 88c09aa..9ecfb08 100644 --- a/layouts/partials/share-menu.html +++ b/layouts/partials/share-menu.html @@ -1,10 +1,10 @@
    -
    -
      -
      -

      Share this post

      -
      - {{ partial "share-links" . }} -
    -
    +
    +
      +
      +

      Share this post

      +
      + {{ partial "share-links" . }} +
    +
    diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 1d73998..1d50d86 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,139 +1,134 @@ - - - {{ if ne ($.Scratch.Get "showCategories") false }} - -
    -
    -

    - Categories -

    -
    - {{ if .Site.Params.categoriesByCount }} - {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.ByCount }} - {{ else }} - {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.Alphabetical }} - {{ end }} + + + {{ if ne ($.Scratch.Get "showCategories") false }} + +
    +
      +
      +

      Categories

      +
      - {{ range $key, $value := $.Scratch.Get "categories" }} - - {{ end }} -
    - {{ end }} + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.Alphabetical }} + {{ end }} - - {{ with .Site.Params.intro.about }} -
    -

    About

    -

    {{ . | safeHTML }}

    - Learn More -
    - {{ end }} - - - {{ end }} -

    - {{ with .Site.Copyright | safeHTML }} - {{ . }} - {{ else }} - © {{ .Site.LastChange.Year }} - {{if isset .Site.Params "author" }} - {{ .Site.Params.author}} - {{ else }} - {{ .Site.Title }} + + + {{ with .Site.Params.intro.about }} +

    +

    About

    +

    {{ . | safeHTML }}

    + + +
    {{ end }} - {{end}}. - Powered by Hugo -

    -
    + + + + diff --git a/layouts/partials/social.html b/layouts/partials/social.html index 3a10b86..9b7b8f6 100644 --- a/layouts/partials/social.html +++ b/layouts/partials/social.html @@ -1,133 +1,103 @@ {{ with .Site.Social.github }} -
    • -{{ end }} - -{{ with .Site.Social.gitlab }} -
    • -{{ end }} - -{{ with .Site.Social.stackoverflow }} -
    • +
    • {{ end }} {{ with .Site.Social.bitbucket }} -
    • +
    • {{ end }} {{ with .Site.Social.jsfiddle }} -
    • +
    • {{ end }} {{ with .Site.Social.codepen }} -
    • -{{ end }} - -{{ with .Site.Social.deviantart }} -
    • -{{ end }} - -{{ with .Site.Social.flickr }} -
    • -{{ end }} - -{{ with .Site.Social.behance }} -
    • -{{ end }} - -{{ with .Site.Social.dribbble }} -
    • -{{ end }} - -{{ with .Site.Social.wordpress }} -
    • -{{ end }} - -{{ with .Site.Social.medium}} -
    • -{{ end }} - -{{ with .Site.Social.linkedin }} -
    • +
    • {{ end }} {{ with .Site.Social.foursquare }} -
    • +
    • {{ end }} -{{ with .Site.Social.xing }} -
    • +{{ with .Site.Social.dribbble }} +
    • {{ end }} -{{ with .Site.Social.slideshare }} -
    • +{{ with .Site.Social.deviantart }} +
    • {{ end }} -{{ with .Site.Social.facebook }} -
    • +{{ with .Site.Social.behance }} +
    • {{ end }} -{{ with .Site.Social.googleplus }} -
    • +{{ with .Site.Social.flickr }} +
    • {{ end }} -{{ with .Site.Social.reddit }} -
    • +{{ with .Site.Social.instagram }} +
    • {{ end }} {{ with .Site.Social.youtube }} -
    • +
    • {{ end }} {{ with .Site.Social.vimeo }} -
    • +
    • {{ end }} -{{ with .Site.Social.whatsapp }} -
    • +{{ with .Site.Social.vine }} +
    • {{ end }} - +{{ with .Site.Social.medium}} +
    • +{{ end }} -{{ with .Site.Social.wechat }} -
    • +{{ with .Site.Social.wordpress }} +
    • {{ end }} -{{ with .Site.Social.qq }} -
    • +{{ with .Site.Social.tumblr }} +
    • {{ end }} -{{ with .Site.Social.instagram }} -
    • +{{ with .Site.Social.xing }} +
    • {{ end }} -{{ with .Site.Social.tumblr }} -
    • +{{ with .Site.Social.linkedin }} +
    • {{ end }} -{{ with .Site.Social.twitter }} -
    • +{{ with .Site.Social.slideshare }} +
    • {{ end }} -{{ with .Site.Social.skype }} -
    • +{{ with .Site.Social.stackoverflow }} +
    • {{ end }} -{{ with .Site.Social.snapchat }} -
    • +{{ with .Site.Social.reddit }} +
    • {{ end }} {{ with .Site.Social.pinterest }} -
    • +
    • {{ end }} -{{ with .Site.Social.telegram }} -
    • +{{ with .Site.Social.googleplus }} +
    • {{ end }} -{{ with .Site.Social.vine }} -
    • +{{ with .Site.Social.facebook }} +
    • +{{ end }} + +{{ with .Site.Social.twitter }} +
    • {{ end }} {{ with .Site.Social.email }} -
    • +
    • {{ end }} diff --git a/layouts/post/comments.html b/layouts/post/comments.html index 9b993d7..bdea945 100644 --- a/layouts/post/comments.html +++ b/layouts/post/comments.html @@ -1,11 +1,11 @@ {{ if ne .Site.DisqusShortname "" }} - {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} + {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} +
    + {{ template "_internal/disqus.html" . }} +
    + {{ end }} +{{ else if .Site.Params.staticman.staticman }}
    - {{ template "_internal/disqus.html" . }} + {{ .Render "staticman" }}
    - {{ end }} -{{ else if .Site.Params.staticman.staticman }} -
    - {{ .Render "staticman" }} -
    {{ end }} diff --git a/layouts/post/content-list.html b/layouts/post/content-list.html index b051f4a..32c4bcf 100644 --- a/layouts/post/content-list.html +++ b/layouts/post/content-list.html @@ -1,12 +1,12 @@
    - {{ .Render "header" }} - {{ .Render "featured" }} -

    {{ printf "%s" .Summary | markdownify }}

    + {{ .Render "header" }} + {{ .Render "featured" }} +

    {{ printf "%s" .Summary | markdownify }}

    - +
    diff --git a/layouts/post/content-single.html b/layouts/post/content-single.html index e206134..9504dbe 100644 --- a/layouts/post/content-single.html +++ b/layouts/post/content-single.html @@ -1,22 +1,22 @@
    - {{ .Render "header" }} + {{ .Render "header" }} - {{ if .Site.Params.socialShare }} + {{ if not .Site.Params.socialShareDisabled }}
    -
      - {{ partial "share-links" . }} -
    +
      + {{ partial "share-links" . }} +
    - {{ end }} + {{ end }} - {{ .Render "featured" }} -
    - {{ .Content }} -
    + {{ .Render "featured" }} +
    + {{ .Content }} +
    -
    - {{ .Render "footer-category" }} -
    +
    + {{ .Render "footer-category" }} +
    {{ .Render "prev-next" }} diff --git a/layouts/post/featured.html b/layouts/post/featured.html index 861bfe9..7b7aa42 100644 --- a/layouts/post/featured.html +++ b/layouts/post/featured.html @@ -1,13 +1,13 @@ {{ if and (isset .Params "featuredpath") (ne .Params.featuredpath "") }} - {{ $.Scratch.Set "path" .Params.featuredpath }} + {{ $.Scratch.Set "path" .Params.featuredpath }} - {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }} - {{ $.Scratch.Set "structType" "page" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ if and (isset .Params "featured") (ne .Params.featuredpath "") }} + {{ $.Scratch.Set "structType" "page" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} - - {{ .Params.featuredalt }} - - {{ end }} + + {{ .Params.featuredalt }} + + {{ end }} {{ end }} diff --git a/layouts/post/footer-category.html b/layouts/post/footer-category.html index 9888746..35d85a9 100644 --- a/layouts/post/footer-category.html +++ b/layouts/post/footer-category.html @@ -1,46 +1,44 @@
      - {{ if isset .Params "categories" }} - {{ $categoryCount := (len .Params.categories) }} + {{ if isset .Params "categories" }} + {{ $categoryCount := (len .Params.categories) }} - - {{ if ge $categoryCount 1 }} -
    • - {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} - {{ if ne (len $categoryMenu) 0 }} - {{ $categoryMenu := index $categoryMenu 0 }} + + {{ if ge $categoryCount 1 }} +
    • + {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} + {{ if ne (len $categoryMenu) 0 }} + {{ $categoryMenu := index $categoryMenu 0 }} - {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} + {{ $.Scratch.Set "categoryUrl" $categoryMenu.URL }} - {{ with $categoryMenu.Identifier }} -   - {{ end }} + {{ with $categoryMenu.Identifier }} +   + {{ end }} - {{ if gt $categoryCount 1 }} - {{ $categoryMenu.Name }} - {{ else }} - {{ $categoryMenu.Name | singularize }} - {{ end }} - {{ else }} - {{ $.Scratch.Set "categoryUrl" "/categories/" }} + {{ if gt $categoryCount 1 }} + {{ $categoryMenu.Name }} + {{ else }} + {{ $categoryMenu.Name | singularize }} + {{ end }} + {{ else }} + {{ $.Scratch.Set "categoryUrl" "/categories/" }} - {{ if gt $categoryCount 1 }} - Categories - {{ else }} - Category - {{ end }} + {{ if gt $categoryCount 1 }} + Categories + {{ else }} + Category + {{ end }} + {{ end }} +
      • {{ end }} - {{ end }} - {{ end }} - - {{ range .Params.categories }} -
    • - {{ . }} -
      • - {{ end }} + + {{ range .Params.categories }} +
    • {{ . }}
      • + {{ end }}
    diff --git a/layouts/post/header.html b/layouts/post/header.html index 2e44285..e500a35 100644 --- a/layouts/post/header.html +++ b/layouts/post/header.html @@ -1,25 +1,25 @@
    -
    - {{ if $.Scratch.Get "h1" }} -

    {{ .Title }}

    - {{ $.Scratch.Set "h1" false }} - {{ else }} -

    {{ .Title }}

    - {{ end }} - {{ with .Description }} -

    {{ . }}

    - {{ end }} -
    -
    - {{ $.Scratch.Set "dateType" .Date }} +
    + {{ if $.Scratch.Get "h1" }} +

    {{ .Title }}

    + {{ $.Scratch.Set "h1" false }} + {{ else }} +

    {{ .Title }}

    + {{ end }} + {{ with .Description }} +

    {{ . }}

    + {{ end }} +
    +
    + {{ $.Scratch.Set "dateType" .Date }} - - {{ .Params.author }} - {{ if .Site.Params.includeReadingTime }} -

    {{ .ReadingTime }} minute read

    - {{ end }} - -
    + + {{ .Params.author }} + {{ if .Site.Params.includeReadingTime }} +

    {{ .ReadingTime }} minute read

    + {{ end }} + +
    diff --git a/layouts/post/prev-next.html b/layouts/post/prev-next.html index 6279865..64b56de 100644 --- a/layouts/post/prev-next.html +++ b/layouts/post/prev-next.html @@ -1,13 +1,11 @@ diff --git a/layouts/post/single.html b/layouts/post/single.html index a9f19af..20f53ad 100644 --- a/layouts/post/single.html +++ b/layouts/post/single.html @@ -1,12 +1,12 @@ {{ partial "header" . }} -{{ $.Scratch.Set "shareNav" true }} -{{ partial "navbar" . }} -{{ partial "share-menu" . }} - -
    - - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -
    -{{ partial "sidebar" . }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + {{ partial "share-menu" . }} + +
    + + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} +
    + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/post/staticman.html b/layouts/post/staticman.html index 4c5964e..955846b 100644 --- a/layouts/post/staticman.html +++ b/layouts/post/staticman.html @@ -40,7 +40,7 @@
    {{ end }} - {{ end }} +{{ end }} {{ end }} {{ if eq ($.Scratch.Get "hasComments") 0 }} diff --git a/layouts/shortcodes/img-fit.html b/layouts/shortcodes/img-fit.html index b8603d2..08e8224 100644 --- a/layouts/shortcodes/img-fit.html +++ b/layouts/shortcodes/img-fit.html @@ -39,37 +39,37 @@ --> {{ $numOfParams := sub (len .Params) 1 }} {{ if and (ge $numOfParams 3) (not (modBool $numOfParams 2)) }} - {{ $.Scratch.Set "path" (.Get $numOfParams) }} + {{ $.Scratch.Set "path" (.Get $numOfParams) }} - {{ $.Scratch.Set "structType" "shortcode" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ $.Scratch.Set "structType" "shortcode" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} -
    -
    - {{ $.Scratch.Set "count" 1 }} - {{ $.Scratch.Set "imgFile" "" }} - {{ range first $numOfParams .Params }} - {{ if eq ($.Scratch.Get "count") 1 }} -
    - {{ else if eq ($.Scratch.Get "count") 2 }} - {{ if eq . "" }} -
    - {{ $.Scratch.Set "imgFile" "" }} - {{ else }} - {{ $.Scratch.Set "imgFile" . }} - +
    +
    + {{ $.Scratch.Set "count" 1 }} + {{ $.Scratch.Set "imgFile" "" }} + {{ range first $numOfParams .Params }} + {{ if eq ($.Scratch.Get "count") 1 }} +
    + {{ else if eq ($.Scratch.Get "count") 2 }} + {{ if eq . "" }} +
    + {{ $.Scratch.Set "imgFile" "" }} + {{ else }} + {{ $.Scratch.Set "imgFile" . }} + + {{ end }} + {{ else }} + {{ if ne ($.Scratch.Get "imgFile") "" }} + {{ . }} +
    + {{ end }} + {{ $.Scratch.Set "count" 0 }} + {{ end }} + {{ $.Scratch.Add "count" 1 }} {{ end }} - {{ else }} - {{ if ne ($.Scratch.Get "imgFile") "" }} - {{ . }} - -
    - {{ end }} - {{ $.Scratch.Set "count" 0 }} - {{ end }} - {{ $.Scratch.Add "count" 1 }} - {{ end }} +
    -
    {{ end }} diff --git a/layouts/shortcodes/img-post.html b/layouts/shortcodes/img-post.html index 6749f96..6143696 100644 --- a/layouts/shortcodes/img-post.html +++ b/layouts/shortcodes/img-post.html @@ -22,49 +22,47 @@ --> {{ $numOfParams := len .Params }} {{ if and (ge $numOfParams 2) (le $numOfParams 4) }} - - {{ if .IsNamedParams }} - {{ $.Scratch.Set "path" (.Get "path") }} - {{ $.Scratch.Set "file" (.Get "file") }} - {{ $.Scratch.Set "alt" (.Get "alt") }} - {{ $.Scratch.Set "type" (.Get "type") }} - {{ else }} - {{ $.Scratch.Set "path" (.Get 0) }} - {{ $.Scratch.Set "file" (.Get 1) }} - {{ if ge $numOfParams 3 }} - {{ $.Scratch.Set "alt" (.Get 2) }} + + {{ if .IsNamedParams }} + {{ $.Scratch.Set "path" (.Get "path") }} + {{ $.Scratch.Set "file" (.Get "file") }} + {{ $.Scratch.Set "alt" (.Get "alt") }} + {{ $.Scratch.Set "type" (.Get "type") }} {{ else }} - {{ $.Scratch.Set "alt" "" }} + {{ $.Scratch.Set "path" (.Get 0) }} + {{ $.Scratch.Set "file" (.Get 1) }} + {{ if ge $numOfParams 3 }} + {{ $.Scratch.Set "alt" (.Get 2) }} + {{ else }} + {{ $.Scratch.Set "alt" "" }} + {{ end }} + {{ if ge $numOfParams 4 }} + {{ $.Scratch.Set "type" (.Get 3) }} + {{ else }} + {{ $.Scratch.Set "type" "center" }} + {{ end }} {{ end }} - {{ if ge $numOfParams 4 }} - {{ $.Scratch.Set "type" (.Get 3) }} - {{ else }} - {{ $.Scratch.Set "type" "center" }} - {{ end }} - {{ end }} - {{ $file := $.Scratch.Get "file" }} - {{ $type := $.Scratch.Get "type" }} - {{ $alt := $.Scratch.Get "alt" }} + {{ $file := $.Scratch.Get "file" }} + {{ $type := $.Scratch.Get "type" }} + {{ $alt := $.Scratch.Get "alt" }} - {{ $.Scratch.Set "structType" "shortcode" }} - {{ partial "img-path" . }} - {{ $path := $.Scratch.Get "path" }} + {{ $.Scratch.Set "structType" "shortcode" }} + {{ partial "img-path" . }} + {{ $path := $.Scratch.Get "path" }} - {{ if eq $type "left" }} - - {{ $alt }} - - {{ else if eq $type "right" }} - - {{ $alt }} - - {{ else }} -

    - - {{ $alt }} - -

    - {{ end }} + {{ if eq $type "left" }} + + {{ $alt }} + + {{ else if eq $type "right" }} + + {{ $alt }} + + {{ else }} +

    + {{ $alt }} +

    + {{ end }} {{ end }} diff --git a/layouts/shortcodes/url-link.html b/layouts/shortcodes/url-link.html index c2b5f5e..419c098 100644 --- a/layouts/shortcodes/url-link.html +++ b/layouts/shortcodes/url-link.html @@ -1,10 +1,10 @@ {{ $numOfParams := len .Params }} {{ if and (ge $numOfParams 2) (le $numOfParams 3) }} - {{ if eq $numOfParams 3 }} - {{ $.Scratch.Set "target" (.Get 2) }} - {{ else }} - {{ $.Scratch.Set "target" "_blank" }} - {{ end }} + {{ if eq $numOfParams 3 }} + {{ $.Scratch.Set "target" (.Get 2) }} + {{ else }} + {{ $.Scratch.Set "target" "_blank" }} + {{ end }} - {{ .Get 0 }} + {{ .Get 0 }} {{ end }} diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html index 0fd749f..8881b14 100644 --- a/layouts/taxonomy/category.html +++ b/layouts/taxonomy/category.html @@ -1,16 +1,16 @@ {{ partial "general-title" . }} {{ partial "header" . }} -{{ partial "navbar" . }} - -
    -

    {{ .Title }}

    - {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} - {{ range $paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} + {{ partial "navbar" . }} + +
    +

    {{ .Title }}

    + {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} + {{ range $paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -
    -{{ partial "sidebar" . }} + {{ partial "pagination" . }} +
    + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html index 9affa3a..5e504c0 100644 --- a/layouts/taxonomy/category.terms.html +++ b/layouts/taxonomy/category.terms.html @@ -1,33 +1,33 @@ {{ partial "general-title" . }} {{ partial "header" . }} -{{ partial "navbar" . }} - -
    - {{ if .Site.Params.categoriesByCount }} - {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} - {{ else }} - {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} - {{ end }} + {{ partial "navbar" . }} + +
    + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} + {{ end }} -
      -
      -

      {{ .Data.Plural }}

      -
      - {{ $data := .Data }} - {{ range $key, $value := $.Scratch.Get "categories" }} -
    • - -
      • - {{ end }} -
    -
    +
      +
      +

      {{ .Data.Plural }}

      +
      + {{ $data := .Data }} + {{ range $key, $value := $.Scratch.Get "categories" }} +
    • + +
      • + {{ end }} +
    +
    -{{ $.Scratch.Set "showCategories" false }} -{{ partial "sidebar" . }} + {{ $.Scratch.Set "showCategories" false }} + {{ partial "sidebar" . }} {{ partial "footer" . }} diff --git a/static/css/add-on.css b/static/css/add-on.css new file mode 100644 index 0000000..b51259a --- /dev/null +++ b/static/css/add-on.css @@ -0,0 +1,6 @@ +/* + This css file is for individual users to restyle items for their personal site, + or for the implementation of features specifically for their site. Anything that + is an official part of the theme (ex. Pull Requests) should be included in main.css + within the formating given. +*/ diff --git a/static/css/main.css b/static/css/main.css index 00f8dbd..b949545 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -307,9 +307,9 @@ text-align: right; } -/* Author and Format */ +/* Author */ - .author, .format { + .author { display: -moz-flex; display: -webkit-flex; display: -ms-flex; @@ -335,7 +335,7 @@ white-space: nowrap; } - .author .name, .format .name { + .author .name { -moz-transition: border-bottom-color 0.2s ease; -webkit-transition: border-bottom-color 0.2s ease; -ms-transition: border-bottom-color 0.2s ease; @@ -345,16 +345,31 @@ margin: 0 1.5em 0 0; } - .author img, .format img { + .author img { border-radius: 100%; display: block; width: 4em; } - .author:hover .name, .format:hover .name { + .author:hover .name { border-bottom-color: transparent; } +/* Blurb */ + + .blurb h2 { + font-size: 0.8em; + margin: 0 0 1.5em 0; + } + + .blurb h3 { + font-size: 0.7em; + } + + .blurb p { + font-size: 0.9em; + } + /* Box */ .box { @@ -1185,10 +1200,6 @@ transform: scale(1.05); } - .mini-post .image.featured { - margin: 0; - } - .mini-post header { padding: 1.25em 4.25em 0.1em 1.25em ; min-height: 4em; @@ -1213,7 +1224,7 @@ text-transform: uppercase; } - .mini-post header .author, .mini-post header .format { + .mini-post header .author { position: absolute; right: 2em; top: 2em; @@ -1225,7 +1236,7 @@ @media screen and (max-width: 1280px) { - .mini-posts .posts-container { + .mini-posts { display: -moz-flex; display: -webkit-flex; display: -ms-flex; @@ -1234,31 +1245,28 @@ -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; - justify-content: space-between; - width: 100%; + width: calc(100% + 2em); } - .mini-posts .posts-container > * { - margin: 2em 0 0 0; - width: 24%; + .mini-posts > * { + margin: 2em 2em 0 0; + width: calc(50% - 2em); + } + + .mini-posts > :nth-child(-n + 2) { margin-top: 0; } } - @media screen and (max-width: 800px) { - + @media screen and (max-width: 480px) { - .mini-posts .posts-container > * { - margin: 0 0 2em 0; - width: 49%; + .mini-posts { + display: block; + width: 100%; } - } - - @media screen and (max-width: 480px) { - - .mini-posts .posts-container > * { + .mini-posts > * { margin: 0 0 2em 0; width: 100%; } @@ -1792,8 +1800,7 @@ margin-top: 0; } - .itemized > header .meta .author, - .itemized > header .meta .format, { + .itemized > header .meta .author { -moz-flex-direction: row-reverse; -webkit-flex-direction: row-reverse; -ms-flex-direction: row-reverse; @@ -1801,14 +1808,12 @@ margin-bottom: 0; } - .itemized > header .meta .author .name, - .itemized > header .meta .format .name { + .itemized > header .meta .author .name { margin: 0 0 0 1.5em; } - .itemized > header .meta .author img, - .itemized > header .meta .format img { + .itemized > header .meta .author img { width: 3.5em; } @@ -1960,7 +1965,6 @@ table > thead > tr > td, table > tbody > tr > td, table > tfoot > tr > td { - vertical-align: middle; padding: 0.5em; -webkit-transition: all 0.3s ease; -o-transition: all 0.3s ease; @@ -2216,6 +2220,7 @@ line-height: inherit; padding: 0 0 0 1.5em; white-space: nowrap; + min-width: 12.4em; } #header h1 a { @@ -2390,14 +2395,6 @@ padding: 0 0.5em 0 0; } - @media screen and (min-width: 1280px) { - - #header .menu { - display: none; - } - - } - @media screen and (max-width: 980px) { #header .links { @@ -2511,7 +2508,9 @@ padding-top: 0; } - #sidebar #mini-bio p { + #sidebar #recent-posts ul.posts time, + #sidebar #categories ul.posts li header, + #sidebar .blurb p { /* Theoretically for IE 8 & 9 (more valid) */ /* ...but not required as filter works too */ /* should come BEFORE filter */ @@ -2523,8 +2522,6 @@ /* Modern Browsers */ opacity: 0.65; - font-size: 0.9em; - padding: 0; } @media screen and (max-width: 1280px) { @@ -2652,7 +2649,6 @@ } #footer .copyright { - text-align: center; color: #aaaaaa; font-family: "Raleway", Helvetica, sans-serif; font-size: 0.5em; @@ -2839,16 +2835,14 @@ .share-btn.facebook { background: #3B5998; } .share-btn.linkedin { background: #4875B4; } .share-btn.stumbleupon { background: #EB4823; } - .share-btn.pinterest { background: #BD081C; } .share-btn.reddit { background: #ff5700; } .share-btn.email { background: #444444; } - .share-btn.twitter:hover { background: #4c9ad6; } + .share-btn.twitter:hover { background: #4c9ad6 } .share-btn.google-plus:hover { background: #c64333; } .share-btn.facebook:hover { background: #2f4779; } .share-btn.linkedin:hover { background: #4069a2; } .share-btn.stumbleupon:hover { background: #d3401f; } - .share-btn.pinterest:hover { background: #AD0000; } .share-btn.reddit:hover { background: #e54e00; } .share-btn.email:hover { background: #363636; } diff --git a/theme.toml b/theme.toml index e791a5c..f2cac70 100644 --- a/theme.toml +++ b/theme.toml @@ -4,9 +4,9 @@ name = "Hugo Future Imperfect" license = "MIT" licenselink = "https://github.com/jpescador/hugo-future-imperfect/blob/master/LICENSE.md" -description = "HTML5 UP's Future Imperfect ported to Hugo with some extra goodies." +description = "Ported theme of HTML5 UP, future imperfect, with some extra goodies" homepage = "https://github.com/jpescador/hugo-future-imperfect" -tags = ["blog", "responsive", "font awesome", "highlight.js", "fancybox 3", "staticman", "netlify", "disqus"] +tags = ["blog", "responsive", "font awesome", "highlight.js", "fancybox 3", "staticman", "netlify"] features = ["html5", "css3", "responsive"] min_version = 0.15 -- cgit v1.2.3 From 3e034c065b4d9ad07fdc7e2a2aeac4e189bb5e69 Mon Sep 17 00:00:00 2001 From: Patrick Collins Date: Thu, 28 Sep 2017 12:35:04 -0400 Subject: Update shortcode platform to format. More universal. (#12) --- archetypes/itemized.md | 2 +- layouts/itemized/header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/itemized.md b/archetypes/itemized.md index 4479926..2bda772 100644 --- a/archetypes/itemized.md +++ b/archetypes/itemized.md @@ -8,7 +8,7 @@ featuredalt = "" featuredpath = "" link = "" linktitle = "" -platform = "" +format = "" title = "" type = "itemized" diff --git a/layouts/itemized/header.html b/layouts/itemized/header.html index 977f021..9193947 100644 --- a/layouts/itemized/header.html +++ b/layouts/itemized/header.html @@ -13,7 +13,7 @@
    {{ .Params.author }} - {{ .Params.platform }} + {{ .Params.format }} {{ if isset .Params "link" }} Link {{ end }} -- cgit v1.2.3 From ef12b3ff7aa8130f555ceabd1d80e00def8c5a6e Mon Sep 17 00:00:00 2001 From: Patrick Collins Date: Thu, 28 Sep 2017 12:36:01 -0400 Subject: Update Sidebar to Match HTML5Up Original (#13) * Updating the sidebar to be an appropriate port. * Fix recent post formatting --- exampleSite/static/css/add-on.css | 6 + exampleSite/static/js/add-on.js | 0 layouts/partials/footer.html | 56 ++++----- layouts/partials/header.html | 6 +- layouts/partials/navbar.html | 45 ++++--- layouts/partials/sidebar.html | 247 +++++++++++++++++++------------------- static/css/add-on.css | 6 - static/css/main.css | 63 +++++----- 8 files changed, 225 insertions(+), 204 deletions(-) create mode 100644 exampleSite/static/css/add-on.css create mode 100644 exampleSite/static/js/add-on.js delete mode 100644 static/css/add-on.css diff --git a/exampleSite/static/css/add-on.css b/exampleSite/static/css/add-on.css new file mode 100644 index 0000000..b51259a --- /dev/null +++ b/exampleSite/static/css/add-on.css @@ -0,0 +1,6 @@ +/* + This css file is for individual users to restyle items for their personal site, + or for the implementation of features specifically for their site. Anything that + is an official part of the theme (ex. Pull Requests) should be included in main.css + within the formating given. +*/ diff --git a/exampleSite/static/js/add-on.js b/exampleSite/static/js/add-on.js new file mode 100644 index 0000000..e69de29 diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 0a6d18c..df96a53 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,34 +1,34 @@ -
    - - + + + - {{ if isset .Site.Params "customJS" }} - {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} - {{ else }} - {{ $.Scratch.Set "jsFiles" false }} - {{ end }} +{{ if isset .Site.Params "customJS" }} + {{ $.Scratch.Set "jsFiles" .Site.Params.customJS }} +{{ else }} + {{ $.Scratch.Set "jsFiles" false }} +{{ end }} - - {{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} - - - - - - - - {{ end }} + +{{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} + + + + + + + +{{ end }} - {{ if ne ($.Scratch.Get "jsFiles") false }} - {{ range $.Scratch.Get "jsFiles" }} - {{ if ne . "default" }} - - {{ end }} - {{ end }} +{{ if ne ($.Scratch.Get "jsFiles") false }} +{{ range $.Scratch.Get "jsFiles" }} + {{ if ne . "default" }} + {{ end }} + {{ end }} +{{ end }} - - - + + + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index c9881fa..357014e 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -50,14 +50,14 @@ - - + + {{ end }} {{ if ne ($.Scratch.Get "cssFiles") false }} {{ range $.Scratch.Get "cssFiles" }} {{ if ne . "default" }} - + {{ end }} {{ end }} {{ end }} diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 22f04ca..63fe851 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,13 +1,9 @@