whitespace cleanup

Merge remote-tracking branch 'upstream/master'
Merge pull request #59 from arnobbhanja/patch-1
2023-02-03 19:17:47 -08:00 · 2023-02-03 19:10:17 -08:00 · 2021-04-28 16:44:00 +05:30 · 2020-10-15 23:56:35 +05:30 · 2020-05-24 06:49:43 +00:00 · 2020-04-18 23:44:00 -07:00
10 changed files with 127 additions and 81 deletions
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@ -12,6 +12,8 @@
 			<h1 class="page-title">All articles</h1>
 		{{ end }}

+		{{ with .Content }}{{ . }}{{ end }}
+
 		<ul class="posts">
 			{{- range .Data.Pages -}}
 			{{- if (in (.Site.Params.excludedTypes | default (slice "page")) .Type) -}}
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@ -1,22 +1,31 @@
 <!DOCTYPE html>
 <html>
 {{ partial "header.html" . }}
+
 <body>
 	<div class="container wrapper post">
 		{{ partial "head.html" . }}

 		<div class="post-header">
 			<h1 class="title">{{ .Title }}</h1>
-			<div class="meta">Posted at &mdash; {{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</div>
+
+			<div class="meta">
+				{{ if eq .Section "posts" }}
+				Posted at &mdash; {{ dateFormat "Jan 2, 2006" .Date }}
+				{{ end }}
+				{{ if .Draft }}
+				<span class="draft-label">DRAFT</span>
+				{{ end }}
+			</div>
 		</div>

 		<div class="markdown">
-			{{ .Content }}
+			{{- .Content }}
 		</div>

 		<div class="post-tags">
-			{{ if ne .Type "page" }}
-				{{ if gt .Params.tags 0 }}
+			{{- if ne .Type "page" }}
+			{{- if gt .Params.tags 0 }}
 			<nav class="nav tags">
 				<ul class="flat">
 					{{ range .Params.tags }}
@ -24,8 +33,8 @@
 					{{ end }}
 				</ul>
 			</nav>
-				{{ end }}
-			{{ end }}
+			{{- end }}
+			{{- end }}
 		</div>
 		{{- $.Scratch.Set "isDisqus" true -}}

@ -52,4 +61,5 @@
 	</div>
 	{{ partial "footer.html" . }}
 </body>
+
 </html>
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-{{ partial "header.html" . }}
-
-<body>
-	<div class="container wrapper tags">
-		{{ partial "head.html" . }}
-
-		<h1 class="page-title">All tags</h1>
-	</div>
-
-	{{ partial "footer.html" . }}
-</body>
-
-</html>
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@ -6,7 +6,11 @@
 	<div class="container wrapper tags">
 		{{ partial "head.html" . }}

-		<h1 class="page-title">All tags</h1>
+		<h1 class="page-title">{{ .Title }}</h1>
+
+		{{- with .Content }}
+		{{ . }}
+		{{ end -}}

 		{{ $biggest := 1 }}
 		{{ $smallest := 1 }}
--- a/layouts/index.html
+++ b/layouts/index.html
@ -1,20 +1,27 @@
 <!DOCTYPE html>
 <html>
 {{ partial "header.html" . }}
+
 <body>
 	<div class="container wrapper">
 		{{ partial "head.html" . }}

+		<div>
+			{{ with .Content }}{{ . }}{{ end }}
+		</div>
+
+		{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
+		{{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }}
+		{{ if $paginator.Pages }}
 		<div class="recent-posts section">
 			<h2 class="section-header">
 				Recent posts
 			</h2>
 			<div class="posts">
-				{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
-				{{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }}
 				{{ range $paginator.Pages }}
 				<div class="post">
-					<div class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</div>
+					<div class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span
+							class="draft-label">DRAFT</span> {{ end }}</div>
 					<a class="title" href="{{ .RelPermalink }}">{{.Title}}</a> &mdash;
 					<span class="description">
 						{{ if isset .Params "description" }}
@ -28,7 +35,9 @@
 				{{ template "partials/paginator.html" . }}
 			</div>
 		</div>
+		{{ end }}
 	</div>
 	{{ partial "footer.html" . }}
 </body>
+
 </html>
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@ -1,12 +1,38 @@
 <div class="footer wrapper">
 	<nav class="nav">
-		<div>{{ with .Site.Copyright }} {{ . }} | {{ end }} <a href="https://github.com/vividvilla/ezhil">Ezhil theme</a> | Built with <a href="https://gohugo.io">Hugo</a></div>
+		{{- if .Page.Lastmod }}
+		Last updated {{ .Page.Lastmod.Format "January 2, 2006" }}
+		{{- end }}
+
+		{{- if .Site.Copyright }}
+		<div>{{ with .Site.Copyright }} {{ . }} | {{ end }}
+			<a href="https://github.com/vividvilla/ezhil">Ezhil theme</a> | Built with <a
+				href="https://gohugo.io">Hugo</a></div>
+		{{- end }}
 	</nav>
 </div>

+{{ if and (isset .Site.Params "social") (isset .Site.Params "feathericonscdn") (eq .Site.Params.featherIconsCDN true) -}}
+<script async src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script>
+{{- else if (isset .Site.Params "social") -}}
+<script async src="{{ .Site.BaseURL }}js/feather.min.js"></script>
+{{ end }}
+<script async src="{{ .Site.BaseURL }}js/main.js"></script>
+{{- if isset .Site.Params "customjs" -}}
+{{- range .Site.Params.customJS }}
+{{- if or (hasPrefix . "http://") (hasPrefix . "https://") }}
+<script async src="{{ . }}"></script>
+{{- else }}
+<script async src="{{ $.Site.BaseURL }}{{ . }}"></script>
+{{- end }}
+{{- end }}
+{{- end }}
+
 {{ if not .Site.IsServer }}
 {{ template "_internal/google_analytics_async.html" . }}
 {{ end }}
 {{- with .Site.Params.Social -}}
-<script>feather.replace()</script>
+<script>
+	feather.replace()
+</script>
 {{- end -}}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@ -1,10 +1,12 @@
 <div class="header">
+	{{- if .IsHome -}}
 	<base href="{{ .Site.BaseURL }}">
 	<h1 class="site-title"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1>
 	<div class="site-description">
 		{{- if isset .Site.Params "subtitle" -}}
 		<h2>{{ .Site.Params.Subtitle | markdownify }}</h2>
 		{{- end -}}
+		{{ if .Site.Params.Social }}
 		<nav class="nav social">
 			<ul class="flat">
 				{{- range $index, $key := .Site.Params.Social -}}
@ -12,15 +14,20 @@
 				{{- end -}}
 			</ul>
 		</nav>
+		{{ end }}
 	</div>
+	{{ end }}

 	<nav class="nav">
 		<ul class="flat">
-			{{ range .Site.Menus.main }}
+			{{ $current := .RelPermalink }}
+			{{- range .Site.Menus.main }}
+			{{- if ne .URL $current }}
 			<li>
 				<a href="{{ .URL }}">{{ .Name }}</a>
 			</li>
-			{{ end }}
+			{{- end -}}
+			{{- end }}
 		</ul>
 	</nav>
 </div>
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@ -20,7 +20,9 @@

 	{{- template "_internal/opengraph.html" . -}}
 	{{- template "_internal/twitter_cards.html" . -}}
-	<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,300italic,400italic|Raleway:200,300" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,300italic,400italic|Raleway:200,300"
+		rel="stylesheet">
+	<link href="{{ .Site.BaseURL }}css/fonts.css" rel="stylesheet">

 	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/normalize.css" />
 	<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" />
@ -28,25 +30,12 @@
 	<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customCSS }}" />
 	{{ end }}
 	{{- if or (eq .Site.Params.mode "auto") (eq .Site.Params.mode "dark") -}}
-	<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}css/dark.css" {{ if eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)"{{ end }} />
+	<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}css/dark.css"
+		{{ if eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)" {{ end }} />
 	{{- if isset .Site.Params "customdarkcss" }}
-	<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customDarkCSS }}" {{ if eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)"{{ end }} />
+	<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customDarkCSS }}"
+		{{ if eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)" {{ end }} />
 	{{- end }}
 	{{- end }}

-	{{ if and (isset .Site.Params "social") (isset .Site.Params "feathericonscdn") (eq .Site.Params.featherIconsCDN true) -}}
-	<script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script>
-	{{- else if (isset .Site.Params "social") -}}
-	<script src="{{ .Site.BaseURL }}js/feather.min.js"></script>
-	{{ end }}
-	<script src="{{ .Site.BaseURL }}js/main.js"></script>
-	{{- if isset .Site.Params "customjs" -}}
-	{{- range .Site.Params.customJS }}
-	{{- if or (hasPrefix . "http://") (hasPrefix . "https://") }}
-	<script src="{{ . }}"></script>
-	{{- else }}
-	<script src="{{ $.Site.BaseURL }}{{ . }}"></script>
-	{{- end }}
-	{{- end }}
-	{{- end }}
 </head>
--- a/static/css/fonts.css
+++ b/static/css/fonts.css
@ -0,0 +1,2 @@
+@import url('https://fonts.googleapis.com/css2?family=Frank+Ruhl+Libre:wght@300;400;500;700;900&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap');
--- a/static/css/main.css
+++ b/static/css/main.css
@ -1,18 +1,23 @@
 body {
-    font-family: "ubuntu", sans-serif;
+    font-family: "Verdana", sans-serif;
    font-weight: 400;
    color: #333;
    line-height: 1.6;
    font-size: 16px;
 }

-a, a:hover {
+a,
+a:hover {
    color: #a00;
    text-decoration: none;
    word-break: break-word;
 }

-html,button,input,select,textarea {
+html,
+button,
+input,
+select,
+textarea {
    color: #333;
 }

@ -42,7 +47,7 @@ img {
 }

 a img {
-    border:none;
+    border: none;
 }

 figure {
@ -64,7 +69,7 @@ blockquote {
    margin-left: 1rem;
    font-style: italic;
    font-size: 1.4rem;
-    font-family: Georgia,bitstream charter,serif;
+    font-family: Georgia, bitstream charter, serif;
    border-left: 3px solid;
    border-color: #a00;
    padding-left: 20px;
@ -79,7 +84,8 @@ blockquote em {
    font-weight: 600;
 }

-a,a:hover {
+a,
+a:hover {
    color: #a00;
    text-decoration: none
 }
@ -88,11 +94,16 @@ a:hover {
    text-decoration: underline
 }

-h1,h2,h3,h4,h5,h6 {
-    font-family: raleway,sans-serif;
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-family: "Frank Ruhl Libre", sans-serif;
    line-height: 1.2;
    color: #333;
-    font-weight: 200;
+    font-weight: 500;
 }

 h1 {
@ -202,12 +213,12 @@ pre code {
 }

 .container {
-    margin-top: 50px;
+    margin-top: 30px;
 }

 .header {
    margin-bottom: 20px;
-    padding-bottom: 20px;
+    /* padding-bottom: 20px; */
 }

 .header h1,
@ -223,8 +234,8 @@ pre code {
 }

 .header nav {
-    margin-top: 20px;
-    border-top: 1px solid #f4f4f4;
+    /* margin-top: 10px; */
+    /* border-top: 1px solid #f4f4f4; */
 }

 .header nav ul,
@ -384,7 +395,8 @@ table th {
    background-color: #f4f4f4;
 }

-table th, table td {
+table th,
+table td {
    padding: 10px 20px;
    border: 1px solid #dddddd;
 }
Author	SHA1	Message	Date
Ask Bjørn Hansen	f474fc158a	whitespace cleanup	2023-02-03 19:17:47 -08:00
Ask Bjørn Hansen	99abc442a1	Merge remote-tracking branch 'upstream/master'	2023-02-03 19:10:17 -08:00
Vivek R	10adb45d85	Merge pull request #59 from arnobbhanja/patch-1 render default term landing page	2021-04-28 16:44:00 +05:30
arnobbhanja	15cc437536	render default term landing page current term.html broke the landing page and nothing was being rendered except 'All tags' text in a header. Until a specific layout is decided the default landing page generated by Hugo should suffice.	2020-10-15 23:56:35 +05:30
Vivek R	6477aa7a9a	Merge pull request #45 from obar/content-in-list-pages Include front matter in home and list pages if provided	2020-05-24 06:49:43 +00:00
Ask Bjørn Hansen	98d08f23b8	Whitespace fixes	2020-04-18 23:44:00 -07:00
Ask Bjørn Hansen	e649063146	Local tweaks	2020-04-18 02:47:22 -07:00
Ori	c9e27c471a	Include front matter in home and list pages if provided Contents in `_index.md` files will be used if the relevant files exist, per hugo documentation: https://gohugo.io/templates/lists/#add-content-and-front-matter-to-list-pages	2020-02-18 23:53:05 -05:00