diff options
| author | wd <wd@wdicc.com> | 2017-04-17 12:59:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 12:59:45 +0300 |
| commit | e0fc5f7e5db33850b0622370e008c419c85382ee (patch) | |
| tree | c924837bbb4eee1b5e59b960c3f467f9ad92cca6 | |
| parent | bf8215226770b2271553cdce6133b7611d749801 (diff) | |
| parent | 6416d231bb8425a24f62d80c836a7f3bab99bb91 (diff) | |
Merge pull request #1 from bep/fixes
Misc fixes
| -rw-r--r-- | layouts/partials/article.html | 6 | ||||
| -rw-r--r-- | layouts/partials/css/screen.css | 3 | ||||
| -rw-r--r-- | layouts/partials/head.html | 5 | ||||
| -rw-r--r-- | layouts/partials/header.html | 4 | ||||
| -rw-r--r-- | layouts/partials/post/sharing.html | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/layouts/partials/article.html b/layouts/partials/article.html index a3d7133..5149e0a 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -18,7 +18,9 @@ <div class="entry-content">{{ .post.Content }}</div> {{ end }} <div class="meta"> - {{ if .theme.disqus_shortname }} - <span class="comments"><a href="{{ .post.URL }}#disqus_thread">Comments</a></span> + {{ with .theme }} + {{ if .disqus_shortname }} + <span class="comments"><a href="{{ $.post.URL }}#disqus_thread">Comments</a></span> + {{ end }} {{ end }} </div> diff --git a/layouts/partials/css/screen.css b/layouts/partials/css/screen.css index 57cd18e..4fc798d 100644 --- a/layouts/partials/css/screen.css +++ b/layouts/partials/css/screen.css @@ -1,4 +1,3 @@ -<style> @charset "UTF-8"; @font-face { font-family: 'FontAwesome'; @@ -4114,4 +4113,4 @@ body { -moz-animation-duration: 0.75s; -o-animation-duration: 0.75s; animation-duration: 0.75s; } -</style> + diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 9007fde..43805df 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -16,8 +16,9 @@ <link href="{{ .RSSLink }}" rel="alternate" title="{{ .Site.Title }}" type="application/atom+xml"> <link href="{{ .Site.BaseURL }}/images/fav.ico" rel="shortcut icon"> - - {{ partial "css/screen.css" . }} + <style> + {{ partial "css/screen.css" . | safeCSS }} + </style> <link href="{{ .Site.BaseURL }}/css/custom.css" media="screen, projection" rel="stylesheet" type="text/css"> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 78bf8a4..88094db 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -8,6 +8,8 @@ <span class="subtitle">{{ if $theme.subtitle }}{{ $theme.subtitle }}{{ end }}</span> <br> -{{ partial "social.html" (dict "theme" $theme) }} +{{ with $theme }} +{{ partial "social.html" (dict "theme" .) }} +{{ end }} {{ partial "navigation.html" . }} diff --git a/layouts/partials/post/sharing.html b/layouts/partials/post/sharing.html index 34e6a60..0d59531 100644 --- a/layouts/partials/post/sharing.html +++ b/layouts/partials/post/sharing.html @@ -1,3 +1,4 @@ +{{ if .theme }} <div class="share"> <div class="addthis_toolbox addthis_default_style "> {{ if .theme.facebook_like }} @@ -13,3 +14,4 @@ </div> <script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid={{ .theme.addthis_profile_id }}"></script> </div> +{{ end }}
\ No newline at end of file |