kidwellj
/
jeremykidwell.info
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small fixes and content updates

This commit is contained in:
Jeremy Kidwell 2018-01-23 12:28:55 +00:00
parent fdfb1eb10b
commit 4295b135f1
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
layouts/index.html
View File

@ -1,25 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<head>
<meta charset="utf-8">
{{ partial "meta.html" . }}
{{ partial "meta.html" . }}
<base href="{{ .Site.BaseURL }}">
<title>{{ .Site.Title }}</title>
<link rel="canonical" href="{{ .Permalink }}">
<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
<base href="{{ .Site.BaseURL }}">
<title>{{ .Site.Title }}</title>
<link rel="canonical" href="{{ .Permalink }}">
<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
{{ partial "head_includes.html" . }}
</head>
<body>
<div id="topbar">
<div class="wrapper">
<header>
{{ partial "sidebar.html" . }}
</header>
{{ partial "head_includes.html" . }}
</head>
<body>
<div id="topbar">
<div class="wrapper">
<header>
{{ partial "sidebar.html" . }}
</header>
</div>
</div>
</div>
<div class="wrapper">
<div class="units-row">
@ -34,11 +34,7 @@
<p></p>
</div>
</div>
<<<<<<< HEAD
{{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
=======
{{ range first 5 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
>>>>>>> ad061bf5da969819ab07a42ecac5fa2069916a04
<div class="units-row-end">
<div class="unit-33 dateblock">
<h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
@ -53,8 +49,11 @@
{{ end }}
</div>
</div>
{{ end }}
<hr>
<div class="units-row-end">
<div class="unit-33 dateblock">&nbsp;</div>
</div>
@ -80,14 +79,14 @@
<h3>Recent &amp; Upcoming Presentations</h3>
<ul class="compact fa-ul">
{{ range (where .Data.Pages.ByDate "Section" "presentations").Reverse }}
{{ if (ge .Date.Unix .Now.Unix) }}
{{ if (le .Date.Unix (add .Now.Unix 10368000)) }}
{{ if (ge .Date.Unix now.Unix) }}
{{ if (le .Date.Unix (add now.Unix 10368000)) }}
<li><i class="fa-li fa fa-comment-o fa-fw" style="color:#b00;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><em>{{ .Title | safeHTML }}</em></a>, {{ .Params.host | safeHTML }} ({{ .Date.Format "2 January 2006" }}). {{ partial "comingsoon.html" . }}
</li>
{{ end }}
{{ end }}
{{ if (ge .Now.Unix .Date.Unix ) }}
{{ if (le .Now.Unix (add .Date.Unix 12368000)) }}
{{ if (ge now.Unix .Date.Unix ) }}
{{ if (le now.Unix (add .Date.Unix 12368000)) }}
<li><i class="fa-li fa fa-comment-o fa-fw" style="color:#e88;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><em>{{ .Title | safeHTML }}</em></a>, {{ .Params.host | safeHTML }} ({{ .Date.Format "2 January 2006" }}).
</li>
{{ end }}