Merge branch 'master' of github.com:calintat/minimal

9 years ago · 6082ea0a59
parent 1181f4a98c a1b371cf9c
commit 6082ea0a59
6 changed files with 33 additions and 13 deletions
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@ -2,6 +2,7 @@ baseURL = "http://example.com/"
 languageCode = "en-us"
 title = "Minimal"
 theme = "minimal"
+disqusShortname = "username" # delete this to disable disqus comments

 [params]
    author = "Calin Tataru"
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -17,10 +17,14 @@

    {{ end }}

-</main>
+    {{ if and .Site.DisqusShortname (not .Params.disableComments) }}
+
+        <h4 class="page-header">Comments</h4>
+
+        {{ template "_internal/disqus.html" . }}

-{{ if .Site.DisqusShortname }}
-  {{ template "_internal/disqus.html" . }}
-{{ end }}
+    {{ end }}
+
+</main>

 {{ partial "footer.html" . }}
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@ -1,16 +1,14 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}">
-
    <head>
-
-        <title>{{ .Title }}</title>
-
-        {{ partial "css" . }} {{ partial "js" . }} {{ .Hugo.Generator }}
-
        <meta charset="utf-8">
-
        <meta name="viewport" content="width=device-width, initial-scale=1">
-
+        <title>{{ .Title }}</title>
+        {{ partial "css" . }} {{ partial "js" . }} {{ .Hugo.Generator }}
+        {{ if .RSSLink }}
+        <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+        <link href="{{ .RSSLink }}" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" />
+        {{ end }}
    </head>

    <body>
--- a/layouts/partials/js.html
+++ b/layouts/partials/js.html
@ -17,3 +17,6 @@

 <!-- bootstrap -->
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
+<!-- dismiss expanded navigation bar with click -->
+<script>$(document).on('click', function() { $('.collapse').collapse('hide'); })</script>
--- a/layouts/partials/list-item.html
+++ b/layouts/partials/list-item.html
@ -1,7 +1,17 @@
 <div class="item">

    {{ $.Scratch.Set "link" .RelPermalink }}
-    {{ with .Params.repo }} {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }} {{ end }}
+    {{ with .Params.repo }}
+        {{ $repoHost := default "github" $.Params.repoHost }}
+        {{ if eq "github" $repoHost }}
+            {{ printf "https://github.com/%s/%s/" $.Site.Params.githubUsername . | $.Scratch.Set "link" }}
+        {{ else if eq "gitlab" $repoHost }}
+            {{ printf "https://gitlab.com/%s/%s/" $.Site.Params.gitlabUsername . | $.Scratch.Set "link" }}
+        {{ else if eq "bitbucket" $repoHost }}
+            {{ printf "https://bitbucket.org/%s/%s/" $.Site.Params.bitbucketUsername . | $.Scratch.Set "link" }}
+        {{ end }}
+    {{ end }}
+    {{ with .Params.link }} {{ $.Scratch.Set "link" . }} {{ end }}

    {{ .Date.Format (.Site.Params.dateFormat | default "January 2, 2006") | $.Scratch.Set "subtitle" }}
    {{ with .Description }} {{ $.Scratch.Set "subtitle" . }} {{ end }}
--- a/static/css/main.css
+++ b/static/css/main.css
@ -88,3 +88,7 @@ a:hover {
 footer {
    border-bottom: var(--border-width) solid var(--accent);
 }
+
+img {
+    max-width: 100%;
+}