diff options
| author | pacollins <thepatrickcollins@gmail.com> | 2017-09-28 18:43:07 +0300 |
|---|---|---|
| committer | pacollins <thepatrickcollins@gmail.com> | 2017-09-28 18:43:07 +0300 |
| commit | 3e538735e24e23b6fb5f73319d97be658fb5d884 (patch) | |
| tree | 18ae77952cac143e1ea34025a127999f4e1442a7 /layouts | |
| parent | f0415e77aa1b0c17cb7adff3e7367d6c7d19bb8c (diff) | |
Revert "Update Theme"
This reverts commit f0415e77aa1b0c17cb7adff3e7367d6c7d19bb8c.
Diffstat (limited to 'layouts')
36 files changed, 771 insertions, 853 deletions
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 @@ <header> - <div class="title"> - {{ if $.Scratch.Get "h1" }} - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - {{ $.Scratch.Set "h1" false }} - {{ else }} - <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> - {{ end }} - {{ with .Description }} - <p>{{ . }}</p> - {{ end }} - </div> + <div class="title"> + {{ if $.Scratch.Get "h1" }} + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + {{ $.Scratch.Set "h1" false }} + {{ else }} + <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + {{ end }} + {{ with .Description }} + <p>{{ . }}</p> + {{ end }} + </div> </header> 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" . }} -<!-- Main --> -<div id="main"> - {{ $paginator := .Paginate .Data.Pages }} - {{ range .Paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + {{ $paginator := .Paginate .Data.Pages }} + {{ range .Paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -</div> -{{ partial "sidebar" . }} + {{ partial "pagination" . }} + </div> + {{ 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" . }} -<!-- Main --> -<div id="main"> - <article class="post"> - {{ $.Scratch.Set "h1" true }} - {{ .Render "header" }} - <div id="content"> - {{ .Content }} + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + <article class="post"> + {{ $.Scratch.Set "h1" true }} + {{ .Render "header" }} + <div id="content"> + {{ .Content }} + </div> + </article> </div> - </article> -</div> -{{ 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 @@ <div id="main"> <article class="post"> <header> - <div class="title"> - {{ if $.Scratch.Get "h1" }} - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - {{ $.Scratch.Set "h1" false }} - {{ else }} - <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> - {{ end }} - {{ with .Description }} - <p>{{ . }}</p> - {{ end }} - </div> + <div class="title"> + {{ if $.Scratch.Get "h1" }} + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + {{ $.Scratch.Set "h1" false }} + {{ else }} + <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + {{ end }} + {{ with .Description }} + <p>{{ . }}</p> + {{ end }} + </div> </header> <div id="content"> {{ .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" . }} -<!-- Main --> -<div id="main"> - <article class="post"> - <header> - <div class="title"> - {{ if $.Scratch.Get "h1" }} - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - {{ $.Scratch.Set "h1" false }} - {{ else }} - <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> - {{ end }} - {{ with .Description }} - <p>{{ . }}</p> - {{ end }} - </div> - </header> - <div id="content"> - {{ .Content }} - <div class="contact-container"> - {{ if .Params.netlify }} - <form name="contact" action="thank-you" netlify center width="300px"> - {{ else }} - <form id="contact" action="//{{ .Params.emailservice }}" method="post" center width="300px"> - {{ end }} - <h4>Replies Typically Within 24 Hours.</h4> - <fieldset> - <input placeholder="{{ .Params.contactname }}" type="text" name="name" tabindex="1" required autofocus> - </fieldset> - <fieldset> - <input placeholder="{{ .Params.contactemail}}" type="email" name="email" tabindex="2" required> - </fieldset> - <fieldset> - <textarea placeholder="{{ .Params.contactmessage}}" name="message" tabindex="3" required></textarea> - </fieldset> - <fieldset> - <button name="submit" class="button" type="submit" id="contact-submit" tabindex="4">Submit</button> - </fieldset> - </form> - </div> + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + <article class="post"> + <header> + <div class="title"> + {{ if $.Scratch.Get "h1" }} + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + {{ $.Scratch.Set "h1" false }} + {{ else }} + <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + {{ end }} + {{ with .Description }} + <p>{{ . }}</p> + {{ end }} + </div> + </header> + <div id="content"> + {{ .Content }} + <div class="contact-container"> + {{ if .Params.netlify }} + <form name="contact" action="thank-you" netlify center width="300px"> + {{ else }} + <form id="contact" action="//{{ .Params.emailservice }}" method="post" center width="300px"> + {{ end }} + <h4>Replies Typically Within 24 Hours.</h4> + <fieldset> + <input placeholder="{{ .Params.contactname }}" type="text" name="name" tabindex="1" required autofocus> + </fieldset> + <fieldset> + <input placeholder="{{ .Params.contactemail}}" type="email" name="email" tabindex="2" required> + </fieldset> + <fieldset> + <textarea placeholder="{{ .Params.contactmessage}}" name="message" tabindex="3" required></textarea> + </fieldset> + <fieldset> + <button name="submit" class="button" type="submit" id="contact-submit" tabindex="4">Submit</button> + </fieldset> + </form> + </div> + </div> + </article> </div> - </article> -</div> -{{ 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" . }} -<!-- Main --> -<div id="main"> - {{ range first 4 (where .Site.Pages "Type" "post") }} - {{ .Render "content-list" }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + {{ range first 1 (where .Site.Pages "Type" "post") }} + {{ .Render "content-single" }} - {{ partial "share-menu" . }} - {{ end }} -</div> -{{ partial "sidebar" . }} + {{ partial "share-menu" . }} + {{ end }} + </div> + {{ 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 @@ <article class="itemized"> - {{ .Render "header" }} + {{ .Render "header" }} </article> 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 @@ <article class="post"> - {{ .Render "header" }} + {{ .Render "header" }} - {{ if .Site.Params.socialShare }} + {{ if not .Site.Params.socialShareDisabled }} <section id="social-share"> - <ul class="icons"> - {{ partial "share-links" . }} - </ul> + <ul class="icons"> + {{ partial "share-links" . }} + </ul> </section> - {{ end }} + {{ end }} - {{ .Render "featured" }} - <div id="content"> - {{ .Content }} - </div> + {{ .Render "featured" }} + <div id="content"> + {{ .Content }} + </div> - <footer> - {{ .Render "footer-category" }} - </footer> + <footer> + {{ .Render "footer-category" }} + </footer> </article> {{ .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 @@ <ul class="stats"> - {{ if isset .Params "categories" }} - {{ $categoryCount := (len .Params.categories) }} + {{ if isset .Params "categories" }} + {{ $categoryCount := (len .Params.categories) }} - <!-- - Set the title before displaying the categories associated with this post. - The title will use the variables from the Categories menu set in the Config. - If the Categories menu was not set then use the default values instead. - --> - {{ if ge $categoryCount 1 }} - <li> - {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} - {{ if ne (len $categoryMenu) 0 }} - {{ $categoryMenu := index $categoryMenu 0 }} + <!-- + Set the title before displaying the categories associated with this post. + The title will use the variables from the Categories menu set in the Config. + If the Categories menu was not set then use the default values instead. + --> + {{ if ge $categoryCount 1 }} + <li> + {{ $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 }} - <i class="{{ . }}"> </i> - {{ end }} + {{ with $categoryMenu.Identifier }} + <i class="{{ . }}"> </i> + {{ 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 }} - </li> + {{ if gt $categoryCount 1 }} + Categories + {{ else }} + Category + {{ end }} + {{ end }} + </li> + {{ end }} {{ end }} - {{ end }} - <!-- Display the categories associated with this post --> - {{ range .Params.categories }} - <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li> - {{ end }} + <!-- Display the categories associated with this post --> + {{ range .Params.categories }} + <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li> + {{ end }} </ul> 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 @@ <header> - <div class="title"> - {{ if $.Scratch.Get "h1" }} - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - {{ $.Scratch.Set "h1" false }} - {{ else }} - <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> - {{ end }} - {{ with .Description }} - <p>{{ . }}</p> - {{ end }} - </div> - <div class="meta"> + <div class="title"> + {{ if $.Scratch.Get "h1" }} + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + {{ $.Scratch.Set "h1" false }} + {{ else }} + <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + {{ end }} + {{ with .Description }} + <p>{{ . }}</p> + {{ end }} + </div> + <div class="meta"> - <span class="author">{{ .Params.author }}</span> - <span class="format">{{ .Params.format }}</span> - {{ if isset .Params "link" }} - <a href="{{ .Params.link }}">Link</a> - {{ end }} - <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>--> - </div> + <span class="author">{{ .Params.author }}</span> + <span class="author">{{ .Params.platform }}</span> + {{ if isset .Params "link" }} + <a href="{{ .Params.link }}">Link</a> + {{ end }} + <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>--> + </div> </header> 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" . }} -<!-- Main --> -<div id="main"> - <!-- Post --> - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -</div> -{{ partial "sidebar" . }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + {{ partial "share-menu" . }} + <!-- Main --> + <div id="main"> + <!-- Post --> + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} + </div> + {{ 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" }} - <link rel="apple-touch-icon-precomposed" href='/favicon/apple-touch-icon-precomposed{{ $favVer }}.png'> - <link rel="icon" href='/favicon/favicon{{ $favVer }}.png'> - <!--[if IE]><link rel="shortcut icon" href='/favicon{{ $favVer }}.ico'><![endif]--> - <meta name="msapplication-TileColor" content="#da532c"> - <meta name="msapplication-TileImage" content='/favicon/mstile{{ $favVer }}.png'> + <link rel="apple-touch-icon-precomposed" + href='/favicon/apple-touch-icon-precomposed{{ $favVer }}.png'> + <link rel="icon" href='/favicon/favicon{{ $favVer }}.png'> + <!--[if IE]><link rel="shortcut icon" href='/favicon{{ $favVer }}.ico'><![endif]--> + <meta name="msapplication-TileColor" content="#da532c"> + <meta name="msapplication-TileImage" + content='/favicon/mstile{{ $favVer }}.png'> {{ 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 @@ -</div> -<a id="back-to-top" href="#" class="fa fa-arrow-up fa-border fa-2x"></a> -<!-- Scripts --> + </div> + <a id="back-to-top" href="#" class="fa fa-arrow-up fa-border fa-2x"></a> + <!-- Scripts --> -{{ 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 the value "default" is passed into the param then we will first - load the standard js files associated with the theme --> -{{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} - <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/skel/3.0.1/skel.min.js"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.js"></script> - <script src="{{ "js/util.js" | absURL }}"></script> - <script src="{{ "js/main.js" | absURL }}"></script> - <script src="{{ "js/backToTop.js" | absURL }}"></script> -{{ end }} + <!-- If the value "default" is passed into the param then we will first + load the standard js files associated with the theme --> + {{ if or (in ($.Scratch.Get "jsFiles") "default") (eq ($.Scratch.Get "jsFiles") false) }} + <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/skel/3.0.1/skel.min.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.js"></script> + <script src="/js/util.js"></script> + <script src="/js/main.js"></script> + <script src="/js/backToTop.js"></script> + {{ end }} -{{ if ne ($.Scratch.Get "jsFiles") false }} - {{ range $.Scratch.Get "jsFiles" }} - {{ if ne . "default" }} - <script src="{{ "{{ . }}" | absURL }}"></script> + {{ if ne ($.Scratch.Get "jsFiles") false }} + {{ range $.Scratch.Get "jsFiles" }} + {{ if ne . "default" }} + <script src="{{ . }}"></script> + {{ end }} + {{ end }} {{ end }} - {{ end }} -{{ end }} -<!-- This is called by default since this theme uses highlight.js --> -<script>hljs.initHighlightingOnLoad();</script> -</body> + <!-- This is called by default since this theme uses highlight.js --> + <script>hljs.initHighlightingOnLoad();</script> + </body> </html> 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) --> <html> - <head> - {{ with $.Scratch.Get "generalTitle" }} - <title>{{ . }}</title> - {{ else }} - {{ with .Title }} - <title>{{ . }}</title> - {{ else }} - <title>{{ .Site.Title }}</title> - {{ end }} - {{ end }} + <head> + {{ with $.Scratch.Get "generalTitle" }} + <title>{{ . }}</title> + {{ else }} + {{ with .Title }} + <title>{{ . }}</title> + {{ else }} + <title>{{ .Site.Title }}</title> + {{ end }} + {{ end }} - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - {{ .Hugo.Generator }} - {{ partial "favicon" . }} + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + {{ .Hugo.Generator }} + {{ partial "favicon" . }} - {{ with .Params.author }} - <meta name="author" content="{{ . }}"> - {{ end }} - {{ with .Description }} - <meta name="description" content="{{ . }}"> - {{ else }} - {{ with .Site.Params.description }} - <meta name="description" content="{{ . }}"> - {{ end }} - {{ end }} + {{ with .Params.author }} + <meta name="author" content="{{ . }}"> + {{ end }} + {{ with .Description }} + <meta name="description" content="{{ . }}"> + {{ else }} + {{ with .Site.Params.description }} + <meta name="description" content="{{ . }}"> + {{ 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 the value "default" is passed into the param then we will first - load the standard css files associated with the theme --> - {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css"> - <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700"> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.css" /> - <link rel="stylesheet" href="{{ "css/main.css" | absURL }}"> - <link rel="stylesheet" href="{{ "css/add-on.css" | absURL }}"> - {{ end }} + <!-- If the value "default" is passed into the param then we will first + load the standard css files associated with the theme --> + {{ if or (in ($.Scratch.Get "cssFiles") "default") (eq ($.Scratch.Get "cssFiles") false) }} + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css"> + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700"> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> + <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.1.20/jquery.fancybox.min.css" /> + <link rel="stylesheet" href="/css/main.css"> + <link rel="stylesheet" href="/css/add-on.css"> + {{ end }} - {{ if ne ($.Scratch.Get "cssFiles") false }} - {{ range $.Scratch.Get "cssFiles" }} - {{ if ne . "default" }} - <link rel="stylesheet" href="{{ . | absURL }}"> + {{ if ne ($.Scratch.Get "cssFiles") false }} + {{ range $.Scratch.Get "cssFiles" }} + {{ if ne . "default" }} + <link rel="stylesheet" href="{{ . }}"> + {{ end }} + {{ end }} {{ end }} - {{ end }} - {{ end }} - {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} - {{ template "_internal/google_analytics.html" . }} - {{ end }} - </head> - <body> + {{ if not (in (printf "%#v" .Site.BaseURL) "localhost") }} + {{ template "_internal/google_analytics.html" . }} + {{ end }} + </head> + <body> - <!-- Wrapper --> - <div id="wrapper"> + <!-- Wrapper --> + <div id="wrapper"> 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 @@ <!-- This partial is used by the img shortcodes and the template, -featured in the post type + featured in the post type Set the path depending on the value passed through @@ -13,19 +13,19 @@ featured in the post type {{ $structType := $.Scratch.Get "structType" }} {{ if eq $path "title" }} - {{ $.Scratch.Set "path" "/img/" }} - {{ if eq $structType "shortcode" }} - {{ $.Scratch.Add "path" (lower (replace .Page.LinkTitle " " "-")) }} - {{ else }} - {{ $.Scratch.Add "path" (lower (replace .LinkTitle " " "-")) }} - {{ end }} + {{ $.Scratch.Set "path" "/img/" }} + {{ if eq $structType "shortcode" }} + {{ $.Scratch.Add "path" (lower (replace .Page.LinkTitle " " "-")) }} + {{ else }} + {{ $.Scratch.Add "path" (lower (replace .LinkTitle " " "-")) }} + {{ end }} {{ else if eq $path "date" }} - {{ $.Scratch.Set "path" "/img/" }} - {{ if eq $structType "shortcode" }} - {{ $.Scratch.Add "path" (.Page.Date.Format "2006/01") }} - {{ else }} - {{ $.Scratch.Add "path" (.Date.Format "2006/01") }} - {{ end }} + {{ $.Scratch.Set "path" "/img/" }} + {{ if eq $structType "shortcode" }} + {{ $.Scratch.Add "path" (.Page.Date.Format "2006/01") }} + {{ else }} + {{ $.Scratch.Add "path" (.Date.Format "2006/01") }} + {{ end }} {{ else }} - {{ $.Scratch.Set "path" $path }} + {{ $.Scratch.Set "path" $path }} {{ end }} diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index c11e841..22f04ca 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,43 +1,45 @@ <!-- Header --> <header id="header"> - {{ if .IsHome }} - <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1> - {{ else if ne .Section "" }} - <h1><a href="/">{{ .Section }}</a></h1> - {{ else }} - <h1><a href="/">{{ .Title }}</a></h1> - {{ end }} - - <nav class="links"> - <ul> - {{ range .Site.Menus.main }} - <li> - <a href="{{ .URL }}"> - <i class="{{ .Identifier }}"> </i>{{ .Name }} - </a> - </li> - {{ end }} - </ul> - </nav> - <nav class="main"> - <ul> - {{ if $.Scratch.Get "shareNav" }} - <li id="share-nav" class="share-menu" style="display:none;"> - <a class="fa-share-alt" href="#share-menu">Share</a> - </li> + {{ if .Site.Params.dynamicTitles }} + {{ if .IsHome }} + <h1><a href="/">{{ .Site.Params.navbarTitle }}</a></h1> + {{ else }} + <h1><a href="/">{{ .Section }}</a></h1> {{ end }} - <li class="search"> - <a class="fa-search" href="#search">Search</a> - <form id="search" method="get" action="//google.com/search"> - <input type="text" name="q" placeholder="Search" /> - <input type="hidden" name="as_sitesearch" value="{{ .Site.BaseURL }}"> - </form> - </li> - <li class="menu"> - <a class="fa-bars" href="#menu">Menu</a> - </li> - </ul> - </nav> + {{ else }} + <h1><a href="/">{{ .Site.Params.navbarTitle }}</i></a></h1> + {{ end }} + + <nav class="links"> + <ul> + {{ range .Site.Menus.main }} + <li> + <a href="{{ .URL }}"> + <i class="{{ .Identifier }}"> </i>{{ .Name }} + </a> + </li> + {{ end }} + </ul> + </nav> + <nav class="main"> + <ul> + {{ if $.Scratch.Get "shareNav" }} + <li id="share-nav" class="share-menu" style="display:none;"> + <a class="fa-share-alt" href="#share-menu">Share</a> + </li> + {{ end }} + <li class="search"> + <a class="fa-search" href="#search">Search</a> + <form id="search" method="get" action="//google.com/search"> + <input type="text" name="q" placeholder="Search" /> + <input type="hidden" name="as_sitesearch" value="{{ .Site.BaseURL }}"> + </form> + </li> + <li class="menu"> + <a class="fa-bars" href="#menu">Menu</a> + </li> + </ul> + </nav> </header> <!-- Menu --> @@ -66,43 +68,24 @@ </ul> </section> - <!-- Posts List --> - <section id="recent-posts"> - <div class="mini-posts"> + <!-- Recent Posts --> + <section> + <ul class="links"> <header> <h3>Recent Posts</h3> </header> - {{ $.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") }} - <article class="mini-post"> - <header> - <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3> - {{ $.Scratch.Set "dateType" .Date }} - <time class="published" datetime= - '{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'> - {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }}</time> - </header> - {{ .Render "featured" }} - </article> - {{ end }} - - {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} - <a href= - {{ with .Site.Params.viewMorePostLink }} - {{ . }} - {{ else }} - "/post/" - {{ end }} - class="button">View more posts</a> + {{ range first ($.Scratch.Get "postLimit") (where .Site.Pages "Type" "post") }} + <li> + <a href="{{ .Permalink }}"><p>{{ .Title }}</p></a> + </li> {{ end }} - </div> + </ul> </section> <!-- Actions --> 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 @@ <!-- Pagination --> <ul class="actions pagination"> - {{ if .Paginator.HasPrev }} - <li> - <a href="{{ .Paginator.Prev.URL }}" class="button big previous">Previous Page</a> - </li> - {{ else }} - <li> - <a href="#" class="disabled button big previous">Previous Page</a> - </li> - {{ end }} + {{ if .Paginator.HasPrev }} + <li><a href="{{ .Paginator.Prev.URL }}" + class="button big previous">Previous Page</a></li> + {{ else }} + <li><a href="#" class="disabled button big previous">Previous Page</a></li> + {{ end }} - {{ if .Paginator.HasNext }} - <li> - <a href="{{ .Paginator.Next.URL }}" class="button big next">Next Page</a> - </li> - {{ else }} - <li> - <a href="#" class="disabled button big next">Next Page</a> - </li> - {{ end }} + {{ if .Paginator.HasNext }} + <li><a href="{{ .Paginator.Next.URL }}" + class="button big next">Next Page</a></li> + {{ else }} + <li><a href="#" class="disabled button big next">Next Page</a></li> + {{ end }} </ul> 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 @@ <!-- Social Share Button HTML --> <!-- Twitter --> -<li> - <a href="//twitter.com/share?url={{ .Permalink }}&text={{ .Title }}&via={{ .Site.Social.twitter }}" target="_blank" class="share-btn twitter"> +<li><a href="//twitter.com/share?url={{ .Permalink }}&text={{ .Title }}&via={{ .Site.Social.twitter }}" target="_blank" class="share-btn twitter"> <i class="fa fa-twitter"></i> <p>Twitter</p> - </a> -</li> +</a></li> <!-- Google Plus --> -<li> - <a href="//plus.google.com/share?url={{ .Permalink }}" target="_blank" class="share-btn google-plus"> +<li><a href="//plus.google.com/share?url={{ .Permalink }}" target="_blank" class="share-btn google-plus"> <i class="fa fa-google-plus"></i> <p>Google+</p> - </a> -</li> +</a></li> <!-- Facebook --> -<li> - <a href="//www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" target="_blank" class="share-btn facebook"> +<li><a href="//www.facebook.com/sharer/sharer.php?u={{ .Permalink }}" target="_blank" class="share-btn facebook"> <i class="fa fa-facebook"></i> <p>Facebook</p> - </a> -</li> +</a></li> -<!-- Reddit --> -<li> - <a href="//reddit.com/submit?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn reddit"> +<!-- Reddit (url, title) --> +<li><a href="//reddit.com/submit?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn reddit"> <i class="fa fa-reddit-alien"></i> <p>Reddit</p> - </a> -</li> +</a></li> <!-- LinkedIn --> -<li> - <a href="//www.linkedin.com/shareArticle?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn linkedin"> - <i class="fa fa-linkedin"></i> - <p>LinkedIn</p> - </a> -</li> +<li><a href="//www.linkedin.com/shareArticle?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn linkedin"> + <i class="fa fa-linkedin"></i> + <p>LinkedIn</p> +</a></li> -<!-- StumbleUpon --> -<li> - <a href="//www.stumbleupon.com/submit?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn stumbleupon"> +<!-- StumbleUpon (url, title) --> +<li><a href="//www.stumbleupon.com/submit?url={{ .Permalink }}&title={{ .Title }}" target="_blank" class="share-btn stumbleupon"> <i class="fa fa-stumbleupon"></i> <p>StumbleUpon</p> - </a> -</li> - -<!-- Pintrest --> -<li> - <a href="//www.pinterest.com/pin/create/button/?url={{ .Permalink }}&description={{ .Title }}" target="_blank" class="share-btn pinterest"> - <i class="fa fa-pinterest-p"></i> - <p>Pinterest</p> - </a> -</li> +</a></li> <!-- Email --> -<li> - <a href="mailto:?subject=Check out this post by {{ .Params.author }}&body={{ .Permalink }}" target="_blank" class="share-btn email"> +<li><a href="mailto:?subject=Check out this post by {{ .Params.author }}&body={{ .Permalink }}" target="_blank" class="share-btn email"> <i class="fa fa-envelope"></i> <p>Email</p> - </a> -</li> +</a></li> 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 @@ <section id="share-menu"> - <section id="social-share-nav"> - <ul class="links"> - <header> - <h3>Share this post <i class="fa fa-smile-o"></i></h3> - </header> - {{ partial "share-links" . }} - </ul> - </section> + <section id="social-share-nav"> + <ul class="links"> + <header> + <h3>Share this post <i class="fa fa-smile-o"></i></h3> + </header> + {{ partial "share-links" . }} + </ul> + </section> </section> 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 @@ <!-- Sidebar --> <section id="sidebar"> - <!-- Intro --> - <section id="intro"> - {{ $pic := .Site.Params.intro.pic }} - {{ with $pic.src }} - {{ if $pic.circle }} - <img src="{{ . }}" class="intro-circle" width="{{ $pic.width }}" alt="{{ $pic.alt }}" /> - {{ else if $pic.imperfect }} - <a href="/" class="logo"><img src="{{ . }}" alt="{{ $pic.alt }}" /></a> - {{ else }} - <img src="{{ . }}" width="{{ $pic.width }}" alt="{{ $pic.alt }}" /> - {{ end }} - {{ end }} - {{ with .Site.Params.intro }} - <header> - <h2>{{ .header }}</h2> - <p>{{ .paragraph | safeHTML }}</p> - </header> - {{ end }} - {{ if .Site.Params.socialAppearAtTop }} - <ul class="icons"> - {{ if .RSSLink }} - <li> - <a href="{{ .RSSLink }}" type="application/rss+xml" target="_blank" title="RSS" class="fa fa-rss"></a> - </li> - {{ end }} - {{ partial "social" . }} - </ul> - {{ end }} - </section> + <!-- Intro --> + <section id="intro"> + {{ $pic := .Site.Params.intro.pic }} + {{ with $pic.src }} + {{ if $pic.circle }} + <img src="{{ . }}" class="intro-circle" width="{{ $pic.width }}" alt="{{ $pic.alt }}" /> + {{ else if $pic.imperfect }} + <a href="/" class="logo"><img src="{{ . }}" alt="{{ $pic.alt }}" /></a> + {{ else }} + <img src="{{ . }}" width="{{ $pic.width }}" alt="{{ $pic.alt }}" /> + {{ end }} + {{ end }} + {{ with .Site.Params.intro }} + <header> + <h2>{{ .header }}</h2> + <p>{{ .paragraph | safeHTML }}</p> + </header> + {{ end }} + <ul class="icons"> + {{ if and (.RSSLink) (.Site.Params.rssAppearAtTop) }} + <li><a href="{{ .RSSLink }}" type="application/rss+xml" + target="_blank" title="RSS" class="fa fa-rss"></a></li> + {{ end }} + {{ if .Site.Params.socialAppearAtTop }} + {{ partial "social" . }} + {{ end }} + </ul> + </section> - <!-- Posts List --> - <section id="recent-posts"> - <div class="mini-posts"> - <header> - <h3>Recent Posts</h3> - </header> - <div class="posts-container"> - {{ $.Scratch.Set "recentPosts" .Site.Pages }} + <!-- Posts List --> + <section id="recent-posts"> + <ul class="posts"> + <header> + <h3>Recent Posts</h3> + </header> + {{ $.Scratch.Set "recentPosts" .Site.Pages }} - {{ with .Site.Params.postAmount.sidebar }} - {{ $.Scratch.Set "postLimit" . }} - {{ else }} - {{ $.Scratch.Set "postLimit" 4 }} - {{ end }} + {{ 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") }} - <article class="mini-post"> - <header> - <h3> - <a href="{{ .Permalink }}">{{ .Title }}</a> - </h3> - {{ $.Scratch.Set "dateType" .Date }} - <time class="published" datetime='{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'> - {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }} - </time> - </header> - {{ .Render "featured" }} - </article> - {{ end }} - </div> + {{ range first ($.Scratch.Get "postLimit") (where ($.Scratch.Get "recentPosts") "Type" "post") }} + <li> + <article> + <header> + <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3> + {{ $.Scratch.Set "dateType" .Date }} + <time class="published" datetime= + '{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'> + {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }}</time> + </header> + </article> + </li> + {{ end }} - {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} - <a href= - {{ with .Site.Params.viewMorePostLink }} - {{ . }} - {{ else }} - "/post/" - {{ end }} - class="button">View more posts</a> - {{ end }} - </div> - </section> + {{ if ge (len (where .Site.Pages "Type" "post")) ($.Scratch.Get "postLimit") }} + <li> + <ul class="actions"> + <li><a href= + {{ with .Site.Params.viewMorePostLink }} + {{ . }} + {{ else }} + "/post/" + {{ end }} + class="button">View more posts</a></li> + </ul> + </li> + {{ end }} + </ul> + </section> - <!-- This if statement only applies if someone goes to the /categories url --> - <!-- Otherwise this section is shown for all other links --> - {{ if ne ($.Scratch.Get "showCategories") false }} - <!-- Categories List --> - <section id="categories"> - <header> - <h3> - <a href="/categories/">Categories</a> - </h3> - </header> - {{ if .Site.Params.categoriesByCount }} - {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.ByCount }} - {{ else }} - {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.Alphabetical }} - {{ end }} + <!-- This if statement only applies if someone goes to the /categories url --> + <!-- Otherwise this section is shown for all other links --> + {{ if ne ($.Scratch.Get "showCategories") false }} + <!-- Categories List --> + <section id="categories"> + <ul class="posts"> + <header> + <h3><a href="/categories/">Categories</a></h3> + </header> - {{ range $key, $value := $.Scratch.Get "categories" }} - <article> - <header> - <a href="/categories/{{ $value.Name | urlize }}/">{{ $value.Name }}</a> - <span style="float:right;">{{ $value.Count }}</span> - </header> - </article> - {{ end }} - </section> - {{ end }} + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Site.Taxonomies.categories.Alphabetical }} + {{ end }} - <!-- About --> - {{ with .Site.Params.intro.about }} - <section id="mini-bio"> - <h3>About</h1> - <p>{{ . | safeHTML }}</p> - <a href="/about/" class="button">Learn More</a> - </section> - {{ end }} - - <!-- Footer --> - <section id="footer"> - {{ if .Site.Params.socialAppearAtBottom }} - <ul class="icons"> - {{ if .RSSLink }} - <li> - <a href="{{ .RSSLink }}" type="application/rss+xml" target="_blank" title="RSS" class="fa fa-rss"></a> - </li> - {{ end }} - {{ partial "social" . }} - </ul> + {{ range $key, $value := $.Scratch.Get "categories" }} + <li> + <article> + <header> + <a href="/categories/{{ $value.Name | urlize }}/">{{ $value.Name }}</a> + <span style="float:right;">{{ $value.Count }}</span> + </header> + </article> + </li> + {{ end }} + </ul> + </section> {{ end }} - <p class="copyright"> - {{ with .Site.Copyright | safeHTML }} - {{ . }} - {{ else }} - © {{ .Site.LastChange.Year }} - {{if isset .Site.Params "author" }} - {{ .Site.Params.author}} - {{ else }} - {{ .Site.Title }} + + <!-- About --> + {{ with .Site.Params.intro.about }} + <section class="blurb"> + <h2>About</h2> + <p>{{ . | safeHTML }}</p> + + <ul class="actions"> + <li><a href="/about/" class="button">Learn More</a></li> + </ul> + </section> {{ end }} - {{end}}. - Powered by <a href="//gohugo.io" target="_blank">Hugo</a> - </p> - </section> + + <!-- Footer --> + <section id="footer"> + <ul class="icons"> + {{ if and (.RSSLink) (.Site.Params.rssAppearAtBottom) }} + <li><a href="{{ .RSSLink }}" type="application/rss+xml" + target="_blank" title="RSS" class="fa fa-rss"></a></li> + {{ end }} + {{ if .Site.Params.socialAppearAtBottom }} + {{ partial "social" . }} + {{ end }} + </ul> + + <p class="copyright">{{ with .Site.Copyright | safeHTML }}{{ . }}{{ else }}© {{ .Site.LastChange.Year }} {{if isset .Site.Params "author" }}{{ .Site.Params.author}}{{ else }}{{ .Site.Title }}{{ end }}{{end}}. Powered by <a href="//gohugo.io" target="_blank">Hugo</a></p> + </section> + </section> 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 }} - <li><a href="//github.com/{{.}}" target="_blank" title="GitHub" class="fa fa-github"></a></li> -{{ end }} - -{{ with .Site.Social.gitlab }} - <li><a href="//gitlab.com/{{.}}" target="_blank" title="GitLab" class="fa fa-gitlab"></a></li> -{{ end }} - -{{ with .Site.Social.stackoverflow }} - <li><a href="//stackoverflow.com/users/{{.}}" target="_blank" title="Stack Overflow" class="fa fa-stack-overflow"></a></li> +<li><a href="//github.com/{{.}}" target="_blank" title="GitHub" class="fa fa-github"></a></li> {{ end }} {{ with .Site.Social.bitbucket }} - <li><a href="//bitbucket.com/{{.}}" target="_blank" title="Bitbucket" class="fa fa-bitbucket"></a></li> +<li><a href="//bitbucket.com/{{.}}" target="_blank" title="Bitbucket" class="fa fa-bitbucket"></a></li> {{ end }} {{ with .Site.Social.jsfiddle }} - <li><a href="//jsfiddle.com/{{.}}" target="_blank" title="JSFiddle" class="fa fa-jsfiddle"></a></li> +<li><a href="//jsfiddle.com/{{.}}" target="_blank" title="JSFiddle" class="fa fa-jsfiddle"></a></li> {{ end }} {{ with .Site.Social.codepen }} - <li><a href="//codepen.io/{{.}}" target="_blank" title="CodePen" class="fa fa-codepen"></a></li> -{{ end }} - -{{ with .Site.Social.deviantart }} - <li><a href="//{{.}}.deviantart.com/" target="_blank" title="DeviantArt" class="fa fa-deviantart"></a></li> -{{ end }} - -{{ with .Site.Social.flickr }} - <li><a href="//flickr.com/photos/{{.}}" target="_blank" title="Flickr" class="fa fa-flickr"></a></li> -{{ end }} - -{{ with .Site.Social.behance }} - <li><a href="//behance.net/{{.}}" target="_blank" title="Behance" class="fa fa-behance"></a></li> -{{ end }} - -{{ with .Site.Social.dribbble }} - <li><a href="//dribbble.com/{{.}}" target="_blank" title="Dribbble" class="fa fa-dribbble"></a></li> -{{ end }} - -{{ with .Site.Social.wordpress }} - <li><a href="//{{.}}.wordpress.com" target="_blank" title="WordPress" class="fa fa-wordpress"></a></li> -{{ end }} - -{{ with .Site.Social.medium}} - <li><a href="//medium.com/@{{.}}" target="_blank" title="Medium" class="fa fa-medium"></a></li> -{{ end }} - -{{ with .Site.Social.linkedin }} - <li><a href="//linkedin.com/in/{{.}}" target="_blank" title="LinkedIn" class="fa fa-linkedin"></a></li> +<li><a href="//codepen.io/{{.}}" target="_blank" title="CodePen" class="fa fa-codepen"></a></li> {{ end }} {{ with .Site.Social.foursquare }} - <li><a href="//foursquare.com/{{.}}" target="_blank" title="Foursquare" class="fa fa-foursquare"></a></li> +<li><a href="//foursquare.com/{{.}}" target="_blank" title="Foursquare" class="fa fa-foursquare"></a></li> {{ end }} -{{ with .Site.Social.xing }} - <li><a href="//xing.com/profile/{{.}}" target="_blank" title="Xing" class="fa fa-xing"></a></li> +{{ with .Site.Social.dribbble }} +<li><a href="//dribbble.com/{{.}}" target="_blank" title="Dribbble" class="fa fa-dribbble"></a></li> {{ end }} -{{ with .Site.Social.slideshare }} - <li><a href="//slideshare.com/{{.}}" target="_blank" title="SlideShare" class="fa fa-slideshare"></a></li> +{{ with .Site.Social.deviantart }} +<li><a href="//{{.}}.deviantart.com/" target="_blank" title="DeviantArt" class="fa fa-deviantart"></a></li> {{ end }} -{{ with .Site.Social.facebook }} - <li><a href="//facebook.com/{{.}}" target="_blank" title="Facebook" class="fa fa-facebook"></a></li> +{{ with .Site.Social.behance }} +<li><a href="//behance.net/{{.}}" target="_blank" title="Behance" class="fa fa-behance"></a></li> {{ end }} -{{ with .Site.Social.googleplus }} - <li><a href="//plus.google.com/+{{.}}" target="_blank" title="Google+" class="fa fa-google-plus"></a></li> +{{ with .Site.Social.flickr }} +<li><a href="//flickr.com/photos/{{.}}" target="_blank" title="Flickr" class="fa fa-flickr"></a></li> {{ end }} -{{ with .Site.Social.reddit }} - <li><a href="//reddit.com/user/{{.}}" target="_blank" title="Reddit" class="fa fa-reddit"></a></li> +{{ with .Site.Social.instagram }} +<li><a href="//instagram.com/{{.}}" target="_blank" title="Instagram" class="fa fa-instagram"></a></li> {{ end }} {{ with .Site.Social.youtube }} - <li><a href="//youtube.com/{{.}}" target="_blank" title="YouTube" class="fa fa-youtube"></a></li> +<li><a href="//youtube.com/{{.}}" target="_blank" title="YouTube" class="fa fa-youtube"></a></li> {{ end }} {{ with .Site.Social.vimeo }} - <li><a href="//vimeo.com/{{.}}" target="_blank" title="Vimeo" class="fa fa-vimeo"></a></li> +<li><a href="//vimeo.com/{{.}}" target="_blank" title="Vimeo" class="fa fa-vimeo"></a></li> {{ end }} -{{ with .Site.Social.whatsapp }} - <li><a href="//api.whatsapp.com/send?phone={{.}}" target="_blank" title="WhatsApp" class="fa fa-whatsapp"></a></li> +{{ with .Site.Social.vine }} +<li><a href="//vine.co/{{.}}" target="_blank" title="Vine" class="fa fa-vine"></a></li> {{ end }} -<!-- TODO: WeChat and QQ Check --> +{{ with .Site.Social.medium}} +<li><a href="//medium.com/@{{.}}" target="_blank" title="Medium" class="fa fa-medium"></a></li> +{{ end }} -{{ with .Site.Social.wechat }} - <li><a href="weixin://contacts/profile/{{.}}" target="_blank" title="WeChat" class="fa fa-weixin"></a></li> +{{ with .Site.Social.wordpress }} +<li><a href="//{{.}}.wordpress.com" target="_blank" title="WordPress" class="fa fa-wordpress"></a></li> {{ end }} -{{ with .Site.Social.qq }} - <li><a href="//wpa.qq.com/msgrd?v=3&uin={{.}}&site=qq&menu=yes" target="_blank" title="QQ" class="fa fa-qq"></a></li> +{{ with .Site.Social.tumblr }} +<li><a href="//{{.}}.tumblr.com" target="_blank" title="Tumblr" class="fa fa-tumblr"></a></li> {{ end }} -{{ with .Site.Social.instagram }} - <li><a href="//instagram.com/{{.}}" target="_blank" title="Instagram" class="fa fa-instagram"></a></li> +{{ with .Site.Social.xing }} +<li><a href="//xing.com/profile/{{.}}" target="_blank" title="Xing" class="fa fa-xing"></a></li> {{ end }} -{{ with .Site.Social.tumblr }} - <li><a href="//{{.}}.tumblr.com" target="_blank" title="Tumblr" class="fa fa-tumblr"></a></li> +{{ with .Site.Social.linkedin }} +<li><a href="//linkedin.com/in/{{.}}" target="_blank" title="LinkedIn" class="fa fa-linkedin"></a></li> {{ end }} -{{ with .Site.Social.twitter }} - <li><a href="//twitter.com/{{.}}" target="_blank" title="Twitter" class="fa fa-twitter"></a></li> +{{ with .Site.Social.slideshare }} +<li><a href="//slideshare.com/{{.}}" target="_blank" title="SlideShare" class="fa fa-slideshare"></a></li> {{ end }} -{{ with .Site.Social.skype }} - <li><a href="skype:{{.}}?userinfo" target="_blank" title="Skype" class="fa fa-skype"></a></li> +{{ with .Site.Social.stackoverflow }} +<li><a href="//stackoverflow.com/users/{{.}}" target="_blank" title="Stack Overflow" class="fa fa-stack-overflow"></a></li> {{ end }} -{{ with .Site.Social.snapchat }} - <li><a href="//snapchat.com/add/{{.}}" target="_blank" title="snapchat" class="fa fa-snapchat"></a></li> +{{ with .Site.Social.reddit }} +<li><a href="//reddit.com/user/{{.}}" target="_blank" title="Reddit" class="fa fa-reddit"></a></li> {{ end }} {{ with .Site.Social.pinterest }} - <li><a href="//pinterest.com/{{.}}" target="_blank" title="Pinterest" class="fa fa-pinterest-p"></a></li> +<li><a href="//pinterest.com/{{.}}" target="_blank" title="Pinterest" class="fa fa-pinterest"></a></li> {{ end }} -{{ with .Site.Social.telegram }} - <li><a href="//telegram.me/{{.}}" target="_blank" title="telegram" class="fa fa-telegram"></a></li> +{{ with .Site.Social.googleplus }} +<li><a href="//plus.google.com/+{{.}}" target="_blank" title="Google+" class="fa fa-google-plus"></a></li> {{ end }} -{{ with .Site.Social.vine }} - <li><a href="//vine.co/{{.}}" target="_blank" title="Vine" class="fa fa-vine"></a></li> +{{ with .Site.Social.facebook }} +<li><a href="//facebook.com/{{.}}" target="_blank" title="Facebook" class="fa fa-facebook"></a></li> +{{ end }} + +{{ with .Site.Social.twitter }} +<li><a href="//twitter.com/{{.}}" target="_blank" title="Twitter" class="fa fa-twitter"></a></li> {{ end }} {{ with .Site.Social.email }} - <li><a href="mailto:{{.}}" title="Email" class="fa fa-envelope"></a></li> +<li><a href="mailto:{{.}}" title="Email" class="fa fa-envelope"></a></li> {{ 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") }} + <article class="post"> + {{ template "_internal/disqus.html" . }} + </article> + {{ end }} +{{ else if .Site.Params.staticman.staticman }} <article class="post"> - {{ template "_internal/disqus.html" . }} + {{ .Render "staticman" }} </article> - {{ end }} -{{ else if .Site.Params.staticman.staticman }} - <article class="post"> - {{ .Render "staticman" }} - </article> {{ 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 @@ <article class="post"> - {{ .Render "header" }} - {{ .Render "featured" }} - <p>{{ printf "%s" .Summary | markdownify }}</p> + {{ .Render "header" }} + {{ .Render "featured" }} + <p>{{ printf "%s" .Summary | markdownify }}</p> - <footer> - <ul class="actions"> - <li><a href="{{ .Permalink }}" class="button big">Continue Reading</a></li> - </ul> - {{ .Render "footer-category" }} - </footer> + <footer> + <ul class="actions"> + <li><a href="{{ .Permalink }}" class="button big">Continue Reading</a></li> + </ul> + {{ .Render "footer-category" }} + </footer> </article> 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 @@ <article class="post"> - {{ .Render "header" }} + {{ .Render "header" }} - {{ if .Site.Params.socialShare }} + {{ if not .Site.Params.socialShareDisabled }} <section id="social-share"> - <ul class="icons"> - {{ partial "share-links" . }} - </ul> + <ul class="icons"> + {{ partial "share-links" . }} + </ul> </section> - {{ end }} + {{ end }} - {{ .Render "featured" }} - <div id="content"> - {{ .Content }} - </div> + {{ .Render "featured" }} + <div id="content"> + {{ .Content }} + </div> - <footer> - {{ .Render "footer-category" }} - </footer> + <footer> + {{ .Render "footer-category" }} + </footer> </article> {{ .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" }} - <a href="{{ .Permalink }}" class="image featured"> - <img src="{{ $path }}/{{ .Params.featured }}" alt="{{ .Params.featuredalt }}" /> - </a> - {{ end }} + <a href="{{ .Permalink }}" class="image featured"> + <img src="{{ $path }}/{{ .Params.featured }}" alt="{{ .Params.featuredalt }}" /> + </a> + {{ 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 @@ <ul class="stats"> - {{ if isset .Params "categories" }} - {{ $categoryCount := (len .Params.categories) }} + {{ if isset .Params "categories" }} + {{ $categoryCount := (len .Params.categories) }} - <!-- - Set the title before displaying the categories associated with this post. - The title will use the variables from the Categories menu set in the Config. - If the Categories menu was not set then use the default values instead. - --> - {{ if ge $categoryCount 1 }} - <li> - {{ $categoryMenu := (where .Site.Menus.main "Name" "Categories") }} - {{ if ne (len $categoryMenu) 0 }} - {{ $categoryMenu := index $categoryMenu 0 }} + <!-- + Set the title before displaying the categories associated with this post. + The title will use the variables from the Categories menu set in the Config. + If the Categories menu was not set then use the default values instead. + --> + {{ if ge $categoryCount 1 }} + <li> + {{ $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 }} - <i class="{{ . }}"> </i> - {{ end }} + {{ with $categoryMenu.Identifier }} + <i class="{{ . }}"> </i> + {{ 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 }} + </li> {{ end }} - </li> {{ end }} - {{ end }} - <!-- Display the categories associated with this post --> - {{ range .Params.categories }} - <li> - <a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a> - </li> - {{ end }} + <!-- Display the categories associated with this post --> + {{ range .Params.categories }} + <li><a href='{{ add ($.Scratch.Get "categoryUrl") . | urlize }}'>{{ . }}</a></li> + {{ end }} </ul> 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 @@ <header> - <div class="title"> - {{ if $.Scratch.Get "h1" }} - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - {{ $.Scratch.Set "h1" false }} - {{ else }} - <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> - {{ end }} - {{ with .Description }} - <p>{{ . }}</p> - {{ end }} - </div> - <div class="meta"> - {{ $.Scratch.Set "dateType" .Date }} + <div class="title"> + {{ if $.Scratch.Get "h1" }} + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + {{ $.Scratch.Set "h1" false }} + {{ else }} + <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2> + {{ end }} + {{ with .Description }} + <p>{{ . }}</p> + {{ end }} + </div> + <div class="meta"> + {{ $.Scratch.Set "dateType" .Date }} - <time class="published" datetime='{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'> - {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }} - </time> - <span class="author">{{ .Params.author }}</span> - {{ if .Site.Params.includeReadingTime }} - <p>{{ .ReadingTime }} minute read</p> - {{ end }} - <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>--> - </div> + <time class="published" + datetime='{{ ($.Scratch.Get "dateType").Format "2006-01-02" }}'> + {{ ($.Scratch.Get "dateType").Format "January 2, 2006" }}</time> + <span class="author">{{ .Params.author }}</span> + {{ if .Site.Params.includeReadingTime }} + <p>{{ .ReadingTime }} minute read</p> + {{ end }} + <!--<a href="#" class="author"><span class="name">Jane Doe</span><img src="images/avatar.jpg" alt="" /></a>--> + </div> </header> 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 @@ <ul class="actions pagination"> - {{ if .PrevInSection }} - <li> - <a href="{{ .PrevInSection.Permalink }}" class="button big previous">{{ .PrevInSection.Title }}</a> - </li> - {{ end }} + {{ if .PrevInSection }} + <li><a href="{{ .PrevInSection.Permalink }}" + class="button big previous">{{ .PrevInSection.Title }}</a></li> + {{ end }} - {{ if .NextInSection }} - <li> - <a href="{{ .NextInSection.Permalink }}" class="button big next">{{ .NextInSection.Title }}</a> - </li> - {{ end }} + {{ if .NextInSection }} + <li><a href="{{ .NextInSection.Permalink }}" + class="button big next">{{ .NextInSection.Title }}</a></li> + {{ end }} </ul> 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" . }} -<!-- Main --> -<div id="main"> - <!-- Post --> - {{ $.Scratch.Set "h1" true }} - {{ .Render "content-single" }} -</div> -{{ partial "sidebar" . }} + {{ $.Scratch.Set "shareNav" true }} + {{ partial "navbar" . }} + {{ partial "share-menu" . }} + <!-- Main --> + <div id="main"> + <!-- Post --> + {{ $.Scratch.Set "h1" true }} + {{ .Render "content-single" }} + </div> + {{ 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 @@ </div> </article> {{ 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" }} - <div class="box alt"> - <div class="row uniform"> - {{ $.Scratch.Set "count" 1 }} - {{ $.Scratch.Set "imgFile" "" }} - {{ range first $numOfParams .Params }} - {{ if eq ($.Scratch.Get "count") 1 }} - <div class="{{ . }}"> - {{ else if eq ($.Scratch.Get "count") 2 }} - {{ if eq . "" }} - </div> - {{ $.Scratch.Set "imgFile" "" }} - {{ else }} - {{ $.Scratch.Set "imgFile" . }} - <span class="image fit"> + <div class="box alt"> + <div class="row uniform"> + {{ $.Scratch.Set "count" 1 }} + {{ $.Scratch.Set "imgFile" "" }} + {{ range first $numOfParams .Params }} + {{ if eq ($.Scratch.Get "count") 1 }} + <div class="{{ . }}"> + {{ else if eq ($.Scratch.Get "count") 2 }} + {{ if eq . "" }} + </div> + {{ $.Scratch.Set "imgFile" "" }} + {{ else }} + {{ $.Scratch.Set "imgFile" . }} + <span class="image fit"> + {{ end }} + {{ else }} + {{ if ne ($.Scratch.Get "imgFile") "" }} + <img src='{{ $path }}/{{ $.Scratch.Get "imgFile" }}' + alt="{{ . }}" /> + </span></div> + {{ end }} + {{ $.Scratch.Set "count" 0 }} + {{ end }} + {{ $.Scratch.Add "count" 1 }} {{ end }} - {{ else }} - {{ if ne ($.Scratch.Get "imgFile") "" }} - <img src='{{ $path }}/{{ $.Scratch.Get "imgFile" }}' alt="{{ . }}" /> - </span> - </div> - {{ end }} - {{ $.Scratch.Set "count" 0 }} - {{ end }} - {{ $.Scratch.Add "count" 1 }} - {{ end }} + </div> </div> - </div> {{ 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) }} - <!-- Check if the Parameter is positional or named - which can handle both. --> - {{ 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) }} + <!-- Check if the Parameter is positional or named + which can handle both. --> + {{ 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" }} - <span class="image left"> - <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> - </span> - {{ else if eq $type "right" }} - <span class="image right"> - <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> - </span> - {{ else }} - <p> - <span class="image center"> - <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> - </span> - </p> - {{ end }} + {{ if eq $type "left" }} + <span class="image left"> + <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> + </span> + {{ else if eq $type "right" }} + <span class="image right"> + <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> + </span> + {{ else }} + <p><span class="image center"> + <img src="{{ $path }}/{{ $file }}" alt="{{ $alt }}" /> + </span></p> + {{ 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 }} - <a href="{{ .Get 1 }}" target='{{ $.Scratch.Get "target"}}'>{{ .Get 0 }}</a> + <a href="{{ .Get 1 }}" target='{{ $.Scratch.Get "target"}}'>{{ .Get 0 }}</a> {{ 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" . }} -<!-- Main --> -<div id="main"> - <h1>{{ .Title }}</h1> - {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} - {{ range $paginator.Pages }} - {{ .Render "content-list" }} - {{ end }} + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + <h1>{{ .Title }}</h1> + {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }} + {{ range $paginator.Pages }} + {{ .Render "content-list" }} + {{ end }} - {{ partial "pagination" . }} -</div> -{{ partial "sidebar" . }} + {{ partial "pagination" . }} + </div> + {{ 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" . }} -<!-- Main --> -<div id="main"> - {{ if .Site.Params.categoriesByCount }} - {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} - {{ else }} - {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} - {{ end }} + {{ partial "navbar" . }} + <!-- Main --> + <div id="main"> + {{ if .Site.Params.categoriesByCount }} + {{ $.Scratch.Set "categories" .Data.Terms.ByCount }} + {{ else }} + {{ $.Scratch.Set "categories" .Data.Terms.Alphabetical }} + {{ end }} - <ul class="posts"> - <header> - <h1>{{ .Data.Plural }}</h1> - </header> - {{ $data := .Data }} - {{ range $key, $value := $.Scratch.Get "categories" }} - <li> - <article> - <header> - <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a> - <span style="float:right;">{{ $value.Count }}</span> - </header> - </article> - </li> - {{ end }} - </ul> -</div> + <ul class="posts"> + <header> + <h1>{{ .Data.Plural }}</h1> + </header> + {{ $data := .Data }} + {{ range $key, $value := $.Scratch.Get "categories" }} + <li> + <article> + <header> + <a href="/{{ $data.Plural }}/{{ $value.Name | urlize }}">{{ $value.Name }}</a> + <span style="float:right;">{{ $value.Count }}</span> + </header> + </article> + </li> + {{ end }} + </ul> + </div> -{{ $.Scratch.Set "showCategories" false }} -{{ partial "sidebar" . }} + {{ $.Scratch.Set "showCategories" false }} + {{ partial "sidebar" . }} {{ partial "footer" . }} |