Merge pull request rhazdon#1 from rhazdon/master

Pull in latest from upstream master
jbarr21 · Apr 20, 2019 · c972e50 · c972e50
2 parents f11d0dc + 617a430
commit c972e50
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 108 deletions.
diff --git a/..._dd4aa44ecb2f6765bf6d6d921265e95a.content → assets/js/prism.js b/..._dd4aa44ecb2f6765bf6d6d921265e95a.content → assets/js/prism.js
diff --git a/assets/scss/_main.scss b/assets/scss/_main.scss
@@ -300,35 +300,3 @@ hr {
 	width: auto;
 	z-index: 100000;
 }
-
-// #home-center {
-//   display: flex;
-//   flex-grow: 1;
-//   flex-direction: column;
-//   justify-content: center;
-// }
-//
-// #home-title {
-//   margin: 0;
-//   text-align: center;
-// }
-//
-// #home-subtitle {
-//   margin-top: 0;
-//   margin-bottom: 1.5em;
-//   text-align: center;
-//   line-height: normal;
-//   font-size: .7em;
-//   font-style: italic;
-//   opacity: .9;
-// }
-//
-// #home-social {
-//   font-size: 1.4em;
-//   text-align: center;
-//   opacity: .8;
-//
-//   a {
-//     margin: 0 .2em;
-//   }
-// }
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,15 +1,17 @@
 {{ define "main" }}
-    <div id="home-center">
-        <h1 id="home-title">{{ .Site.Title }}</h1>
+    <main aria-role="main">
+        <div>
+            <h1>{{ .Site.Title }}</h1>
 
-        {{- with .Site.Params.homeSubtitle }}
-            <p id="home-subtitle">{{.}}</p>
-        {{- end }}
+            {{- with .Site.Params.homeSubtitle }}
+                <p>{{.}}</p>
+            {{- end }}
 
-        {{- with .Site.Params.social }}
-            <div id="home-social">
-                {{ partialCached "social-icons.html" . }}
-            </div>
-        {{- end }}
-    </div>
+            {{- with .Site.Params.social }}
+                <div>
+                    {{ partial "social-icons.html" . }}
+                </div>
+            {{- end }}
+        </div>
+    </main>
 {{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -20,12 +20,11 @@
 {{ end }}
 
 <!-- CSS -->
-<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Source+Code+Pro" rel="stylesheet"
-    type="text/css">
 <link href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.2.1/css/flag-icon.min.css" rel="stylesheet"
     type="text/css">
 
-{{ $style := resources.Get "scss/main.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint }}
+{{ $options := (dict "targetPath" "main.css" "outputStyle" "compressed" "enableSourceMap" true) }}
+{{ $style := resources.Get "scss/main.scss" | resources.ToCSS $options | resources.Minify | resources.Fingerprint }}
 <link rel="stylesheet" href="{{ $style.Permalink }}">
 
 {{ range $val := $.Site.Params.customCSS }}
@@ -46,9 +45,9 @@
 <meta property="article:published_time" content="{{ time .Date }}" />{{ end }}
 
 <!-- RSS -->
-{{ if .RSSLink }}
-<link href="{{ .Site.RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
-{{ end }}
+{{ with .OutputFormats.Get "rss" -}}
+    {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+{{ end -}}
 
 <!-- JSON Feed -->
 {{ if .OutputFormats.Get "json" }}
@@ -59,4 +58,4 @@
 <!-- Custom head tags -->
 {{- if templates.Exists "partials/extra-head.html" -}}
 {{ partial "extra-head.html" . }}
-{{- end }}
+{{- end }}
diff --git a/layouts/partials/javascript.html b/layouts/partials/javascript.html
@@ -1,8 +1,8 @@
 {{ $main := resources.Get "js/main.js" }}
 {{ $menu := resources.Get "js/menu.js" }}
+{{ $prism := resources.Get "js/prism.js" }}
 {{ $theme := resources.Get "js/theme.js" }}
-{{ $js := slice $main $menu $theme | resources.Concat "js/bundle.js" }}
-{{ $secureJS := $js | resources.Fingerprint "sha512" }}
+{{ $secureJS := slice $main $menu $prism $theme | resources.Concat "bundle.js" | resources.Minify | resources.Fingerprint "sha512" }}
 <script type="text/javascript" src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script>
 
 {{- if .Site.GoogleAnalytics }}

diff --git a/layouts/posts/single.html b/layouts/posts/single.html
@@ -15,7 +15,7 @@
         </div>
 
         <article>
-            <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
+            <h1 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h1>
 
             {{- if .Params.toc }}
                 <hr />

diff --git a/resources/_gen/assets/js/js/bundle.js_dd4aa44ecb2f6765bf6d6d921265e95a.json b/resources/_gen/assets/js/js/bundle.js_dd4aa44ecb2f6765bf6d6d921265e95a.json
diff --git a/resources/_gen/assets/js/js/main.js_d11fe7b62c27961c87ecd0f2490357b9.content b/resources/_gen/assets/js/js/main.js_d11fe7b62c27961c87ecd0f2490357b9.content
diff --git a/resources/_gen/assets/js/js/main.js_d11fe7b62c27961c87ecd0f2490357b9.json b/resources/_gen/assets/js/js/main.js_d11fe7b62c27961c87ecd0f2490357b9.json