diff --git a/assets/scss/general.scss b/assets/scss/general.scss
index 9ac20fe..36728e3 100644
--- a/assets/scss/general.scss
+++ b/assets/scss/general.scss
@@ -4,45 +4,17 @@
/* accomodate a blog-like site. */
/* ------------------------------------------------------------------------ */
-/* When setting the primary font stack, apply it to the Pure grid units along */
-/* with `html`, `button`, `input`, `select`, and `textarea`. Pure Grids use */
-/* specific font stacks to ensure the greatest OS/browser compatibility. */
-html,
-button,
-input,
-select,
-textarea,
-p,
-nav,
-section,
-article,
-header,
-footer,
-.pure-g [class*="pure-u"] {
- font-family: et-book, "Noto Serif SC", Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif, "Noto Emoji";
-}
-
-p {
- text-align: justify;
-}
-
-code {
- font-family: Menlo, Meslo, Courier, monospace;
- font-size: 1.125rem;
- line-height: 1.6;
-}
-
-.sidenote,
-.marginnote {
- margin-right: -55%;
- width: 45%;
-}
-
-
/* ------------------------------------------------------------------------ */
/* Generic content, such as the index list pages */
/* ------------------------------------------------------------------------ */
+hr {
+ margin-left: 0;
+ width: 75%;
+ max-width: 45rem;
+ border-color: rgba(250,250,250,0.25);
+}
+
/* Content Title styling. This is mostly to avoid underlying links. */
h1.content-title {
/*max-width: 50rem;*/
@@ -54,12 +26,6 @@ h1.content-title a:visited {
text-decoration: none;
color: inherit;
}
-h1.content-title a:hover,
-h1.content-title a:focus {
- color: darkgray;
-}
-
-
/* ------------------------------------------------------------------------ */
/* Styling for listing pages. */
diff --git a/assets/scss/vendor/tufte.scss b/assets/scss/vendor/tufte.scss
index 46f7b2f..1db8132 100644
--- a/assets/scss/vendor/tufte.scss
+++ b/assets/scss/vendor/tufte.scss
@@ -327,6 +327,7 @@ div.table-wrapper {
letter-spacing: 0.03em;
}
+code,
.code {
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
font-size: 1.125rem;
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 75a6ccb..584ea13 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,14 +6,12 @@
{{ define "main" }}
<div id="layout" class="pure-g">
- <article class="pure-u-1">
- {{ partial "brand.html" . }}
- {{ partial "content.header.html" . }}
- {{ partial "toc.html" . }}
- <section>{{ .Content }}</section>
- <section>
- {{ partial "footer.html" . }}
- </section>
- </article>
+<article class="pure-u-1">
+ {{ partial "content.header.html" . }}
+ {{ partial "toc.html" . }}
+ <section>{{ .Content }}</section>
+ <section>{{ partial "footer.html" . }}</section>
+ <section>{{ partial "nav.html" . }}</section>
+</article>
</div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/brand.html b/layouts/partials/brand.html
index 9dd58d1..b112633 100644
--- a/layouts/partials/brand.html
+++ b/layouts/partials/brand.html
@@ -1,6 +1,6 @@
<header class="brand">
- <a href="{{ .Site.BaseURL }}"><h1>{{ .Site.Title}}</h1></a>
- <h2>{{ .Site.Params.subtitle }}</h2>
- {{ partial "nav.html" . }}
- <hr />
+<a href="{{ .Site.BaseURL }}"><h1>{{ .Site.Title}}</h1></a>
+<h2>{{ .Site.Params.subtitle }}</h2>
+{{ partial "nav.html" . }}
+<hr />
</header>
diff --git a/layouts/partials/content.header.html b/layouts/partials/content.header.html
index f81fc9a..813dcd3 100644
--- a/layouts/partials/content.header.html
+++ b/layouts/partials/content.header.html
@@ -2,9 +2,9 @@
<h1 class="content-title">
{{ if .IsNode }}
- <a href="{{ .Permalink }}">{{ .Title }}</a>
+ {{ .Title }}
{{ else }}
- <a href="{{ .RelPermalink }}">{{ .Title }}{{ if .Draft }} :: Draft {{end}}</a>
+ {{ .Title }}{{ if .Draft }} :: Draft {{end}}
{{ end }}
</h1>
@@ -16,23 +16,19 @@
{{ if or (eq .Type "post") (.Params.meta) }}
<span class="content-meta">
{{ if .Params.author }}
- <i class="fa fa-user"> </i><span class="author">
- {{ .Params.author }}</span> <br>
+ <span class="author">{{ .Params.author }}</span><br />
{{ end }}
{{ if not .Params.hidedate }}
- <i class="fa fa-calendar"></i>
- {{ .Date.Format "Jan 2, 2006" }}
+ {{ .Date.Format "2006-01-02" }}
{{end }}
{{ if not .Params.hidereadtime }}
- <i class="fa fa-clock-o"></i>
- {{ .ReadingTime }} min read
+ {{ .ReadingTime }} min read
{{ end }}
{{ if .Params.categories }}
<br>
- <i class="fa fa-tags"> </i>
{{ range .Params.categories }}
<a href="{{ "/categories/" | absURL }}{{ . | urlize }}">{{ . }}</a>
{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 7c1c6d3..b2f490e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,5 +1,5 @@
<footer class="page-footer">
-<hr>
+<hr />
<div class="previous-post" style="display:inline-block;">
{{ if .PrevPage }}
@@ -75,6 +75,7 @@
</p>
{{ end }}
+{{ if or ( isset .Site.Params "copyright" ) ( isset .Site.Params "copyrightHolder" ) }}
<div class="copyright">
<p>
{{ with .Site.Params.copyright }}
@@ -86,5 +87,6 @@
{{end}}
</p>
</div>
+{{ end }}
</footer>
diff --git a/layouts/partials/header.includes.html b/layouts/partials/header.includes.html
index 34d5ab0..0085298 100644
--- a/layouts/partials/header.includes.html
+++ b/layouts/partials/header.includes.html
@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/normalize.css@8.0.1/normalize.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/normalize.css@8.0.1/normalize.min.css" crossorigin="anonymous" />
<!-- Pure css -->
-<link rel="stylesheet" href="https://unpkg.com/purecss@2.0.6/build/pure-min.css">
+<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/purecss@3.0.0/build/pure-min.css" crossorigin="anonymous" /> -->
<!-- Fonts -->
<!-- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Open+Sans"> -->
@@ -21,7 +21,7 @@
</noscript>
<!-- Font Awesome -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.css">
+<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.14.0/css/all.css"> -->
{{ $htoptions := (dict "targetPath" "/css/hugo-tufte.min.css" "outputStyle" "compressed" "enableSourceMap" true) }}
{{ $htstyle := resources.Get "scss/hugo-tufte.scss"| resources.ExecuteAsTemplate "main.scss" . | resources.ToCSS $htoptions }}
diff --git a/layouts/partials/shortcodes/button.html b/layouts/partials/shortcodes/button.html
index b5a3f20..d80b27c 100644
--- a/layouts/partials/shortcodes/button.html
+++ b/layouts/partials/shortcodes/button.html
@@ -31,9 +31,6 @@
{{- if eq $style "tip" }}{{ $icon = default "lightbulb" }}{{ end }}
{{- end }}
{{- $icon = trim $icon " " }}
-{{- if and $icon (not (findRE ".*?\\bfa-\\w.*?" $icon)) }}
- {{- $icon = printf "fa-fw fas fa-%s" $icon }}
-{{- end }}
{{- $iconposition := .iconposition | default "left" }}
{{- with $context }}
<span class="btn cstyle {{ $style }}"{{ if $color }} style="--VARIABLE-BOX-color: {{ $color }};"{{ end }}>
@@ -43,11 +40,11 @@
<a{{ if $href }} href="{{ $href }}"{{ if gt (len $target) 0 }} target="{{ $target }}"{{ end }}{{ end }}>
{{- end }}
{{- if and $icon (eq $iconposition "left") }}
- <i class="{{ $icon }}"></i>
+ {{ $icon }}
{{- end }}
{{ $title | safeHTML }}
{{- if and $icon (eq $iconposition "right") }}
- <i class="{{ $icon }}"></i>
+ {{ $icon }}
{{- end }}
{{- if $isButton }}
</button>
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
index 8fd4d1a..08316c1 100644
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@@ -1,7 +1,7 @@
{{ if .Params.toc }}
<section>
<details closed class="toc">
- <summary>Contents</summary>
+ <summary>Table of Contents</summary>
{{ .TableOfContents }}
</details>
</section>