Compare commits

..

No commits in common. "f474fc158a1ee7cd4b1e51da48cddc1a4436712e" and "4f12837a2a282fa3f29d982161b906ff37fd5165" have entirely different histories.

10 changed files with 81 additions and 127 deletions

View File

@ -12,8 +12,6 @@
<h1 class="page-title">All articles</h1> <h1 class="page-title">All articles</h1>
{{ end }} {{ end }}
{{ with .Content }}{{ . }}{{ end }}
<ul class="posts"> <ul class="posts">
{{- range .Data.Pages -}} {{- range .Data.Pages -}}
{{- if (in (.Site.Params.excludedTypes | default (slice "page")) .Type) -}} {{- if (in (.Site.Params.excludedTypes | default (slice "page")) .Type) -}}

View File

@ -1,40 +1,31 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
{{ partial "header.html" . }} {{ partial "header.html" . }}
<body> <body>
<div class="container wrapper post"> <div class="container wrapper post">
{{ partial "head.html" . }} {{ partial "head.html" . }}
<div class="post-header"> <div class="post-header">
<h1 class="title">{{ .Title }}</h1> <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>
<div class="markdown"> <div class="markdown">
{{- .Content }} {{ .Content }}
</div> </div>
<div class="post-tags"> <div class="post-tags">
{{- if ne .Type "page" }} {{ if ne .Type "page" }}
{{- if gt .Params.tags 0 }} {{ if gt .Params.tags 0 }}
<nav class="nav tags"> <nav class="nav tags">
<ul class="flat"> <ul class="flat">
{{ range .Params.tags }} {{ range .Params.tags }}
<li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li> <li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
{{ end }} {{ end }}
</ul> </ul>
</nav> </nav>
{{- end }} {{ end }}
{{- end }} {{ end }}
</div> </div>
{{- $.Scratch.Set "isDisqus" true -}} {{- $.Scratch.Set "isDisqus" true -}}
@ -61,5 +52,4 @@
</div> </div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}
</body> </body>
</html>
</html>

View File

@ -0,0 +1,15 @@
<!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>

View File

@ -6,11 +6,7 @@
<div class="container wrapper tags"> <div class="container wrapper tags">
{{ partial "head.html" . }} {{ partial "head.html" . }}
<h1 class="page-title">{{ .Title }}</h1> <h1 class="page-title">All tags</h1>
{{- with .Content }}
{{ . }}
{{ end -}}
{{ $biggest := 1 }} {{ $biggest := 1 }}
{{ $smallest := 1 }} {{ $smallest := 1 }}

View File

@ -1,27 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
{{ partial "header.html" . }} {{ partial "header.html" . }}
<body> <body>
<div class="container wrapper"> <div class="container wrapper">
{{ partial "head.html" . }} {{ 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"> <div class="recent-posts section">
<h2 class="section-header"> <h2 class="section-header">
Recent posts Recent posts
</h2> </h2>
<div class="posts"> <div class="posts">
{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
{{ $paginator := .Paginate (where $pages "Params.hidden" "ne" true) }}
{{ range $paginator.Pages }} {{ range $paginator.Pages }}
<div class="post"> <div class="post">
<div class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span <div class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} <span class="draft-label">DRAFT</span> {{ end }}</div>
class="draft-label">DRAFT</span> {{ end }}</div>
<a class="title" href="{{ .RelPermalink }}">{{.Title}}</a> &mdash; <a class="title" href="{{ .RelPermalink }}">{{.Title}}</a> &mdash;
<span class="description"> <span class="description">
{{ if isset .Params "description" }} {{ if isset .Params "description" }}
@ -35,9 +28,7 @@
{{ template "partials/paginator.html" . }} {{ template "partials/paginator.html" . }}
</div> </div>
</div> </div>
{{ end }}
</div> </div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}
</body> </body>
</html> </html>

View File

@ -1,38 +1,12 @@
<div class="footer wrapper"> <div class="footer wrapper">
<nav class="nav"> <nav class="nav">
{{- if .Page.Lastmod }} <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>
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> </nav>
</div> </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 }} {{ if not .Site.IsServer }}
{{ template "_internal/google_analytics_async.html" . }} {{ template "_internal/google_analytics_async.html" . }}
{{ end }} {{ end }}
{{- with .Site.Params.Social -}} {{- with .Site.Params.Social -}}
<script> <script>feather.replace()</script>
feather.replace() {{- end -}}
</script>
{{- end -}}

View File

@ -1,12 +1,10 @@
<div class="header"> <div class="header">
{{- if .IsHome -}}
<base href="{{ .Site.BaseURL }}"> <base href="{{ .Site.BaseURL }}">
<h1 class="site-title"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1> <h1 class="site-title"><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1>
<div class="site-description"> <div class="site-description">
{{- if isset .Site.Params "subtitle" -}} {{- if isset .Site.Params "subtitle" -}}
<h2>{{ .Site.Params.Subtitle | markdownify }}</h2> <h2>{{ .Site.Params.Subtitle | markdownify }}</h2>
{{- end -}} {{- end -}}
{{ if .Site.Params.Social }}
<nav class="nav social"> <nav class="nav social">
<ul class="flat"> <ul class="flat">
{{- range $index, $key := .Site.Params.Social -}} {{- range $index, $key := .Site.Params.Social -}}
@ -14,20 +12,15 @@
{{- end -}} {{- end -}}
</ul> </ul>
</nav> </nav>
{{ end }}
</div> </div>
{{ end }}
<nav class="nav"> <nav class="nav">
<ul class="flat"> <ul class="flat">
{{ $current := .RelPermalink }} {{ range .Site.Menus.main }}
{{- range .Site.Menus.main }}
{{- if ne .URL $current }}
<li> <li>
<a href="{{ .URL }}">{{ .Name }}</a> <a href="{{ .URL }}">{{ .Name }}</a>
</li> </li>
{{- end -}} {{ end }}
{{- end }}
</ul> </ul>
</nav> </nav>
</div> </div>

View File

@ -20,9 +20,7 @@
{{- template "_internal/opengraph.html" . -}} {{- template "_internal/opengraph.html" . -}}
{{- template "_internal/twitter_cards.html" . -}} {{- template "_internal/twitter_cards.html" . -}}
<link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,300italic,400italic|Raleway:200,300" <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,300italic,400italic|Raleway:200,300" rel="stylesheet">
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/normalize.css" />
<link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" /> <link rel="stylesheet" type="text/css" media="screen" href="{{ .Site.BaseURL }}css/main.css" />
@ -30,12 +28,25 @@
<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customCSS }}" /> <link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .Site.Params.customCSS }}" />
{{ end }} {{ end }}
{{- if or (eq .Site.Params.mode "auto") (eq .Site.Params.mode "dark") -}} {{- if or (eq .Site.Params.mode "auto") (eq .Site.Params.mode "dark") -}}
<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}css/dark.css" <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 eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)" {{ end }} />
{{- if isset .Site.Params "customdarkcss" }} {{- if isset .Site.Params "customdarkcss" }}
<link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}{{ .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 }} />
{{ if eq .Site.Params.mode "auto" }}media="(prefers-color-scheme: dark)" {{ end }} />
{{- end }} {{- end }}
{{- end }} {{- end }}
</head> {{ 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>

View File

@ -1,2 +0,0 @@
@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');

View File

@ -1,23 +1,18 @@
body { body {
font-family: "Verdana", sans-serif; font-family: "ubuntu", sans-serif;
font-weight: 400; font-weight: 400;
color: #333; color: #333;
line-height: 1.6; line-height: 1.6;
font-size: 16px; font-size: 16px;
} }
a, a, a:hover {
a:hover {
color: #a00; color: #a00;
text-decoration: none; text-decoration: none;
word-break: break-word; word-break: break-word;
} }
html, html,button,input,select,textarea {
button,
input,
select,
textarea {
color: #333; color: #333;
} }
@ -47,7 +42,7 @@ img {
} }
a img { a img {
border: none; border:none;
} }
figure { figure {
@ -69,7 +64,7 @@ blockquote {
margin-left: 1rem; margin-left: 1rem;
font-style: italic; font-style: italic;
font-size: 1.4rem; font-size: 1.4rem;
font-family: Georgia, bitstream charter, serif; font-family: Georgia,bitstream charter,serif;
border-left: 3px solid; border-left: 3px solid;
border-color: #a00; border-color: #a00;
padding-left: 20px; padding-left: 20px;
@ -84,8 +79,7 @@ blockquote em {
font-weight: 600; font-weight: 600;
} }
a, a,a:hover {
a:hover {
color: #a00; color: #a00;
text-decoration: none text-decoration: none
} }
@ -94,16 +88,11 @@ a:hover {
text-decoration: underline text-decoration: underline
} }
h1, h1,h2,h3,h4,h5,h6 {
h2, font-family: raleway,sans-serif;
h3,
h4,
h5,
h6 {
font-family: "Frank Ruhl Libre", sans-serif;
line-height: 1.2; line-height: 1.2;
color: #333; color: #333;
font-weight: 500; font-weight: 200;
} }
h1 { h1 {
@ -178,8 +167,8 @@ ul {
} }
.site-title a { .site-title a {
color: #333; color: #333;
text-decoration: none !important; text-decoration: none !important;
} }
.post ul li { .post ul li {
@ -205,7 +194,7 @@ ul {
pre code { pre code {
display: inline-block; display: inline-block;
} }
.wrapper { .wrapper {
max-width: 760px; max-width: 760px;
@ -213,12 +202,12 @@ pre code {
} }
.container { .container {
margin-top: 30px; margin-top: 50px;
} }
.header { .header {
margin-bottom: 20px; margin-bottom: 20px;
/* padding-bottom: 20px; */ padding-bottom: 20px;
} }
.header h1, .header h1,
@ -234,8 +223,8 @@ pre code {
} }
.header nav { .header nav {
/* margin-top: 10px; */ margin-top: 20px;
/* border-top: 1px solid #f4f4f4; */ border-top: 1px solid #f4f4f4;
} }
.header nav ul, .header nav ul,
@ -303,7 +292,7 @@ pre code {
} }
.post-tags a { .post-tags a {
margin-right: 5px; margin-right: 5px;
} }
.post .post-header .meta { .post .post-header .meta {
@ -395,34 +384,33 @@ table th {
background-color: #f4f4f4; background-color: #f4f4f4;
} }
table th, table th, table td {
table td {
padding: 10px 20px; padding: 10px 20px;
border: 1px solid #dddddd; border: 1px solid #dddddd;
} }
@media (max-width: 767px) { @media (max-width: 767px) {
body { body {
padding: 20px; padding: 20px;
} }
h1 { h1 {
font-size: 1.8rem; font-size: 1.8rem;
} }
h2 { h2 {
font-size: 1.6rem; font-size: 1.6rem;
} }
h3 { h3 {
font-size: 1.2rem; font-size: 1.2rem;
} }
h4 { h4 {
font-size: 1rem; font-size: 1rem;
} }
.container { .container {
margin-top: 10px; margin-top: 10px;
} }
} }