diff --git a/themes/osuosl/assets/css/style.css b/themes/osuosl/assets/css/style.css index 1ede86c..7cc6b35 100644 --- a/themes/osuosl/assets/css/style.css +++ b/themes/osuosl/assets/css/style.css @@ -864,6 +864,29 @@ textarea { margin-top: 50px; } +.blog-split { + display: grid; + grid-template-columns: 1fr min(30%, 350px); + gap: 1rem 2rem; +} + +.tag-cloud { + position: sticky; + top: 2rem; +} + +.tag-cloud h2 { + margin-bottom: 0; +} + +.tag-cloud :first-child { + margin-top: 0; +} + +.tag-cloud :last-child { + margin-bottom: 0; +} + .blog-summaries { display: flex; flex-direction: column; @@ -891,6 +914,14 @@ textarea { display: flex; flex-direction: row; } + + .blog-split { + grid-template-columns: 1fr; + } + + .blog-split aside { + order: -1; + } } @media (max-width: 767px) { diff --git a/themes/osuosl/layouts/_default/taxonomy.html b/themes/osuosl/layouts/_default/taxonomy.html new file mode 100644 index 0000000..88e4f35 --- /dev/null +++ b/themes/osuosl/layouts/_default/taxonomy.html @@ -0,0 +1,12 @@ +{{ define "main" }} + {{- partial "menu.html" . -}} +
+

{{ .Title }}

+ {{ .Content }} + +
+{{ end }} diff --git a/themes/osuosl/layouts/_default/term.html b/themes/osuosl/layouts/_default/term.html new file mode 100644 index 0000000..f6139eb --- /dev/null +++ b/themes/osuosl/layouts/_default/term.html @@ -0,0 +1,37 @@ +{{ define "main" }} + {{- partial "menu.html" . -}} +
+

Tag: #{{ .Title }}

+

+ {{ .Pages.Len }} posts tagged #{{ .Page.LinkTitle }} +

+ {{ .Content }} + {{- $studentStories := where (where .Site.RegularPages "Section" "blog") "Params.tags" "intersect" (slice + "student-stories") + }} +
+
+ {{ partial "pagination.html" . }} +
+ {{- range .Paginator.Pages }} + {{- .Render "summary" }} + {{- end }} +
+ {{ partial "pagination.html" . }} +
+ +
+
+{{ end }} diff --git a/themes/osuosl/layouts/blog/list.html b/themes/osuosl/layouts/blog/list.html index b6fe347..2d295a6 100644 --- a/themes/osuosl/layouts/blog/list.html +++ b/themes/osuosl/layouts/blog/list.html @@ -1,18 +1,27 @@ {{ define "main" }} {{- partial "menu.html" . -}}
-

OSU Open Source Lab Blog

- {{ if .Content }} +

Blog

+

All {{ .Pages.Len }} posts

+
- {{ .Content }} +
+ {{- range .Paginator.Pages }} + {{- .Render "summary" }} + {{- end }} +
+ {{ partial "pagination.html" . }}
- {{ end }} - {{ partial "pagination.html" . }} -
- {{- range .Paginator.Pages }} - {{- .Render "summary" }} - {{- end }} +
- {{ partial "pagination.html" . }}
{{ end }} diff --git a/themes/osuosl/layouts/tags/list.html b/themes/osuosl/layouts/tags/list.html deleted file mode 100644 index 6389c6c..0000000 --- a/themes/osuosl/layouts/tags/list.html +++ /dev/null @@ -1,14 +0,0 @@ -{{ define "main" }} - {{- partial "menu.html" . -}} -
-

Student Stories

- {{- $studentStories := where (where .Site.RegularPages "Section" "blog") "Params.tags" "intersect" (slice - "student-stories") - }} -
- {{- range $studentStories }} - {{- .Render "summary" }} - {{- end }} -
-
-{{ end }}