diff --git a/assets/sass/code.scss b/assets/sass/code.scss index 660b1e6..dd4a795 100644 --- a/assets/sass/code.scss +++ b/assets/sass/code.scss @@ -1,18 +1,4 @@ -code { - background: $dark; - border-radius: .4rem; - margin: 0 .2rem; - padding: .2rem .5rem; - white-space: nowrap; -} - -p code { - font-size: .9rem !important; -} - -li code { - font-size: .9rem !important; -} +code { white-space: nowrap; } pre { background-color: $background-color !important; @@ -27,5 +13,6 @@ pre { max-width: 100%; overflow-x: auto; border-left: .3rem solid $code-edge; + border-radius: .4rem; } } diff --git a/assets/sass/main.scss b/assets/sass/main.scss index ca4264b..88b422d 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -14,95 +14,47 @@ body { color: $font-color; margin: 0px; overflow-y: scroll; - font-family: 'Source Sans Pro'; + font-family: 'Helvetica'; + font-size: 1.1rem; } header { background-color: $top-bar; box-shadow: 0px 5px 10px black; - .spread { - gap: 24px; - display: flex; - align-items: flex-end; - justify-content: space-between; - @include screen-max(1000px){justify-content: center;} - ul { - margin: 0px; - padding: 0px; - list-style-type: none; - a { - text-align: center; - margin: auto; - font-weight: bold; - text-decoration: none; - color: $font-color-alternate; - } - } - } nav { - max-width: 1400px; - margin: 0px auto; - padding: 8px; - flex-wrap: wrap; - a { - @include screen-max(1000px){flex-basis: 100%;} - } - img { - max-width: 300px; - display: block; - @include screen-max(1000px){margin: auto; flex-basis: 100%;} - } - } -} - -a { - color: $link-color; - - &:visited, &:hover { - color: $link-color-visited; + @include screen-max(840px){text-align: center;} + img { max-width: 300px; } + + a { + margin-right: 12px; + font-weight: bold; + text-decoration: none; + color: $font-color-alternate; + &:visited {color: $font-color-alternate;} + } } } -main { - max-width: 820px; - margin: auto; - @include screen-max(840px){padding: 0px 16px;} +header, main, section, nav {padding: 0 16px;} - img { - width: 100%; - } -} +main, section, nav {max-width: 920px; margin: auto;} +main img {max-width: 100%} -.center-text { - text-align: center; - flex-basis: 100%; -} +footer {text-align: center;} -a, p, li, h2 { - font-size: 1.25rem; -} -img { - object-fit: cover; +a { + color: $link-color; + &:visited, &:hover { color: $link-color-visited; } } img.featured { - border-radius: 8px; - max-height: 500px; - max-width: 100%; display: block; -} - -.margin { + border-radius: 8px; margin: 12px auto; -} - -.small-text { - font-size: 1rem; -} - -.large-text { - font-size: 2rem; + max-height: 888px; + object-fit: cover; + aspect-ratio: 4/3; } .left-to-right { @@ -117,26 +69,14 @@ img.featured { align-items: center; } -section { - max-width: 1000px; - margin: 16px auto; - padding: 8px; -} - section.article-list { + margin: 8px 0px; display: flex; flex-wrap: wrap; justify-content: center; gap: 40px; } -.center-box { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; -} - .fill-wh { width: 100%; height: 100% diff --git a/layouts/404.html b/layouts/404.html index 180ba9f..f369e15 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,7 +1,7 @@ {{ define "main" }} -
-

404

-

This page doesn't exist. Let's go home

-
+
+

404

+

This page doesn't exist. Let's go home

+
{{ end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 721fb3e..8d52131 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -29,12 +29,12 @@ - {{ partial "header.html" . }} +{{ partial "header.html" . }} - {{ block "main" . }} - {{ end }} +{{ block "main" . }} +{{ end }} - {{ partial "footer.html" . }} +{{ partial "footer.html" . }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 7fa7bbf..902ef18 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,26 +1,41 @@ {{ define "main" }} - {{ $pages := .Site.RegularPages }} - - {{if not .IsHome }} - -

{{ .Title | markdownify | lower }}

- - {{ $pages = .Pages }} - + {{if not .IsHome }} {{ $pages = .Pages }} {{ end }} + +
+

{{ .Title | markdownify | title }}

+ {{ if and .IsSection (not .IsHome) }} {{ partial "article-meta.html" . }} {{ end }} + {{ with .Content }} +
+ {{ . }} +
+ {{- end }} +
+ +
+

Latest Posts:

+ {{ with $pages.Limit 4 }} +
+ {{ range . }} + {{ partial "article.html" . }} + {{ end }} +
{{ end }} - - {{ if templates.Exists "partials/pre-content.html" }} - {{ partial "pre-content.html" . }} +
+ +
+

All Posts:

+ {{ with $pages }} + {{ range .GroupByDate "2006" }} +

{{ .Key }}

+ + {{ end }} {{ end }} - -
{{ .Content }}
- -
- {{ range $pages }} - {{ partial "article.html" . }} - {{ end }} -
+
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 082a91e..c1132e3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,30 +4,17 @@
{{ partial "article-meta.html" . }} - {{ if .Params.toc }} - {{ .TableOfContents }} - {{ end }} - - {{ if templates.Exists "partials/pre-content.html" }} - {{ partial "pre-content.html" . }} - {{ end }} - {{ .Content }} +
-

- - {{ with .NextInSection }} - Next: {{ .Title | markdownify }} -
- {{ end }} - - {{ with .PrevInSection }} - Previous: {{ .Title | markdownify }} -
- {{ end }} +

+ {{ with .NextInSection }} +

Next: {{ .Title | markdownify }}

+ {{ end }} - >> Home -

+ {{ with .PrevInSection }} +

Previous: {{ .Title | markdownify }}

+ {{ end }} +
- {{ end }} diff --git a/layouts/authors/list.html b/layouts/authors/list.html index cd5a915..9edc800 100644 --- a/layouts/authors/list.html +++ b/layouts/authors/list.html @@ -9,26 +9,27 @@

{{ .Params.name }}

{{ .Params.bio }}

- Projects + Projects | - {{ .Params.email}} + {{ .Params.email}} -
- +
{{ .Content }} - -

Posts:

- -
- -
- {{ range .Data.Pages }} - {{ partial "article.html" . }} + + +
+

Latest Posts:

+ {{ with .Data.Pages }} +
+ {{ range . }} + {{ partial "article.html" . }} {{ end }} -
+
+ {{ end }} +
{{ end }} diff --git a/layouts/games/list.html b/layouts/games/list.html deleted file mode 100644 index 5da3fbe..0000000 --- a/layouts/games/list.html +++ /dev/null @@ -1,27 +0,0 @@ -{{ define "main" }} - -
- {{ partial "article-meta.html" . }} - - {{ if .Params.toc }} - {{ .TableOfContents }} - {{ end }} - - {{ .Content }} -
- - {{ if gt (len .Data.Pages) 0 }} - -
-

Devlogs:

-
- -
- {{ range .Data.Pages }} - {{ partial "article.html" . }} - {{ end }} -
- - {{ end }} - -{{ end }} diff --git a/layouts/games/meta-extra.html b/layouts/games/meta-extra.html deleted file mode 100644 index 32bff1e..0000000 --- a/layouts/games/meta-extra.html +++ /dev/null @@ -1,7 +0,0 @@ -{{ with .Params.releaseDate }} -

Released: {{ dateFormat "Mon | Jan 2, 2006" . }}

-{{ end }} - -

Platforms: -{{ delimit .Params.platforms " ยท " }} -

diff --git a/layouts/partials/article-meta.html b/layouts/partials/article-meta.html index 31d94e3..85b8c7d 100644 --- a/layouts/partials/article-meta.html +++ b/layouts/partials/article-meta.html @@ -1,25 +1,19 @@
-

{{ .Title | markdownify }}

- {{ with .Params.authors }} {{ $author := (index . 0) }} -

- Author: {{ $author }} -

+

Author: {{ $author }}

{{ end }} {{ with .Date }} -

Posted: {{ .Format "Mon | Jan 2, 2006" }}

+

Posted: {{ .Format "Mon | Jan 2, 2006" }}

{{ end }} - {{ .Render "meta-extra" }} - {{ range (.GetTerms "tags") }} - {{ .LinkTitle }} + {{ .LinkTitle }} {{ end }} {{ $image := (.Resources.GetMatch "featured") }} - {{ partial "image.html" (dict "image" $image "alt" .Params.featured.alt "class" "shadow featured margin") }} + {{ partial "image.html" (dict "image" $image "alt" .Params.featured.alt "class" "shadow featured") }}
diff --git a/layouts/partials/article.html b/layouts/partials/article.html index ab6853a..416db37 100644 --- a/layouts/partials/article.html +++ b/layouts/partials/article.html @@ -2,16 +2,16 @@ {{ $image := .Resources.GetMatch "featured" }} - {{ partial "image.html" (dict "image" $image "alt" .Params.featured.alt) }} + {{ partial "image-small.html" (dict "image" $image "alt" .Params.featured.alt) }}
{{ with index (.GetTerms "tags") 0 }} - {{ .LinkTitle }} + {{ .LinkTitle }} {{ end }} -

{{ .Title | markdownify }}

+

{{ .Title | markdownify }}

{{ with .Date }}

{{ .Format "2006/01/02" }}

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 0061455..afd8cb9 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,5 +1,5 @@ diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 52ae509..da6f5b5 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,11 +1,11 @@
-
diff --git a/layouts/partials/image-small.html b/layouts/partials/image-small.html new file mode 100644 index 0000000..c5a4cd6 --- /dev/null +++ b/layouts/partials/image-small.html @@ -0,0 +1,32 @@ +{{ .Params.alt }} diff --git a/layouts/partials/image.html b/layouts/partials/image.html index 144df08..e43991b 100644 --- a/layouts/partials/image.html +++ b/layouts/partials/image.html @@ -1,18 +1,35 @@ +

Latest Posts:

+
+ {{ range .Limit 5 }} + {{ partial "article.html" . }} + {{ end }} +
+ +

All Posts:

+ {{ range .GroupByDate "2006" }} +

{{ .Key}}

+ + {{ end }} + +{{ end }}