From ad5dd633e9861e7214b99bd5c49246e4c69e70c5 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Mon, 22 Aug 2022 20:03:48 -0400 Subject: [PATCH] RSS updates, and additional features --- layouts/_default/list.html | 42 +++- layouts/_default/rss.xml | 2 +- layouts/_default/single.html | 18 +- layouts/index.html | 34 ++- layouts/interverse/list.html | 214 +++++++++++++++++++ layouts/partials/footer.html | 2 +- layouts/partials/head.html | 40 +++- layouts/partials/header.html | 11 +- layouts/partials/metadata.html | 15 ++ layouts/partials/sidebar.html | 31 ++- layouts/rss.xml | 30 +++ layouts/shortcodes/audio.html | 2 +- layouts/shortcodes/embed.html | 2 +- layouts/shortcodes/image.html | 14 ++ layouts/shortcodes/video.html | 2 +- static/css/theme.css | 369 +++++++++++++++++++++++++++++---- 16 files changed, 761 insertions(+), 67 deletions(-) create mode 100644 layouts/interverse/list.html create mode 100644 layouts/partials/metadata.html create mode 100644 layouts/rss.xml create mode 100644 layouts/shortcodes/image.html diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5539334..2d16366 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -4,15 +4,39 @@ {{partial "head" .}} - {{partial "header" .}}
-
{{.Content}}
- - -
+ {{ if .Pages }} +
+ {{range .Pages}} +
+
+ {{ if .Params.video}} + + {{else}} + + + + {{end}} +
+
+

{{.Title}}

 +

{{.Params.description}}

+
+
+ {{end}} +
+ {{end}} + + {{partial "footer" .}} + \ No newline at end of file diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index fb893ab..79096cd 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -17,7 +17,7 @@ {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} - + {{- .Content | html -}} {{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4cfb656..a5482f1 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,9 +4,19 @@ {{partial "head" .}} - {{partial "header" .}}
-
{{.Content}}
+ {{partial "header" .}} +
+
+
+ {{.Content}} +
+ {{ if .Params.author}} +
+ {{partial "metadata" .}} +
+ {{end}} +
+
+ {{partial "footer" .}} -
- {{partial "footer" .}} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index fe0077f..3a1cf64 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -4,10 +4,34 @@ {{partial "head" .}} - {{partial "header" .}}
-
{{.Content}}
- + {{partial "header" .}} +
+
+
+ {{.Content}} +
+ {{ if .Site.Data.details.social_links}} +
+
+

Stay up to date

+ + +
+ {{end}} +
+ +
+ {{ partial "footer" .}} -
- {{partial "footer" .}} \ No newline at end of file diff --git a/layouts/interverse/list.html b/layouts/interverse/list.html new file mode 100644 index 0000000..99d9e7a --- /dev/null +++ b/layouts/interverse/list.html @@ -0,0 +1,214 @@ + + + + + {{partial "head" .}} + + + + + + + {{partial "header" .}} +
+
{{.Content}}
+
+ +
+

+ +
+
+
+ +
+
+ +
+
+ +
+

+
+ + +
+ +
+ +
+ + +{{partial "footer" .}} + + \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f3afd56..4af0054 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index fb9cbaa..c4f110c 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,3 +1,39 @@ +{{ .Title}} - -{{.Title}} \ No newline at end of file + + + + + + + +{{if .Params.video}} + + + + + + + + +{{else}} +{{if .Params.peertubeURL}} + +{{else}} +{{if .Params.audioURL}} + + +{{else}} + + +{{end}} +{{end}} +{{end}} +{{ if .Params.image }} + + +{{else}} + + +{{end}} + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 4686be9..0dbb12b 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,9 +1,14 @@
-

{{.Site.Title }}

+ +
+

{{.Site.Data.details.name }}

+ {{.Site.Data.details.description}} +
+
\ No newline at end of file diff --git a/layouts/partials/metadata.html b/layouts/partials/metadata.html new file mode 100644 index 0000000..7c4139e --- /dev/null +++ b/layouts/partials/metadata.html @@ -0,0 +1,15 @@ +
+
+ {{$author := index .Site.Data.details.staff (.Params.author | default "default")}} +

{{$author.name}}

+

Date: {{.Date | time.Format "Jan 02 2006"}}

+
+

Tags:

+ +
+ + \ No newline at end of file diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 7ced6d5..b7a9557 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,5 +1,30 @@ -

Sidebar

-

Recent Content

+{{if .Site.Data.details.featured}} +

Featured

+{{ range .Site.Data.details.featured}} +
+ + + +
+ +

{{.title}}

+ +

{{.description}}

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

Recent Content

+{{range first 5 .Site.RegularPages}} -

Featured

+
+ + + +
+

{{.Title}}

 +

{{.Params.description}}

+
+
+{{end}} diff --git a/layouts/rss.xml b/layouts/rss.xml new file mode 100644 index 0000000..f575599 --- /dev/null +++ b/layouts/rss.xml @@ -0,0 +1,30 @@ + + + {{ .Title }} + {{ .Permalink }} + {{.Params.description}} + + Hugo -- gohugo.io{{ with .Site.LanguageCode }} + {{.}}{{end}} + {{ with .OutputFormats.Get "RSS" }} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{ end }} + {{ range first 15 .Site.RegularPages }} + + {{ .Title }} + {{ .Permalink }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ .Permalink }} + {{.Params.image}} + {{ if .Params.audio }} + + {{end}} + {{ if .Params.video}} + + {{end}} + {{- .Content | html -}} + + {{ end }} + + diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html index 359cd25..0944f88 100644 --- a/layouts/shortcodes/audio.html +++ b/layouts/shortcodes/audio.html @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/layouts/shortcodes/embed.html b/layouts/shortcodes/embed.html index 29d1e04..e7b4476 100644 --- a/layouts/shortcodes/embed.html +++ b/layouts/shortcodes/embed.html @@ -1,2 +1,2 @@ - \ No newline at end of file diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html new file mode 100644 index 0000000..60c0c88 --- /dev/null +++ b/layouts/shortcodes/image.html @@ -0,0 +1,14 @@ +{{ if .Get "href"}} + +{{end}} +{{.Get "alt"}} +{{ if .Get "href"}} + +{{end}} diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html index 9bdfe0b..ebd091b 100644 --- a/layouts/shortcodes/video.html +++ b/layouts/shortcodes/video.html @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/static/css/theme.css b/static/css/theme.css index 170bd12..594317a 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -1,55 +1,352 @@ -body{ - --theme-primary-color:black; - --theme-secondary-color:white; - --theme-accent-color:gold; - background-color: var(--theme-primary-color); - color:var(--theme-secondary-color); - width:100vw; - margin:0; - display:flex; +body { + line-height: 1.25; + --theme-color-primary: black; + --theme-color-secondary: white; + --theme-color-accent: #1d7fd4; + --theme-color-accent-transparent: #1d7fd444; + --theme-color-accent2: #ebb716; + --theme-color-accent2-transparent: #ebb71644; + width: 100vw; + margin: 0px; + padding: 0px; + overflow-x: hidden; + display: flex; flex-direction: row; flex-wrap: wrap; + justify-content: space-evenly; + align-items: center; + color: var(--theme-color-secondary); + background-color: var(--theme-color-primary); +} + +.background-photo { + position: fixed; + top: 40vh; + max-width: 80vw; + max-height: 70vh; + z-index: -1; +} +header{ + margin-top:1rem; +} + +header,footer{ + text-align: center; + width:100vw; +} +footer{ + margin-bottom:0; +} +nav{ + background-color:rgba(0,0,0,0.7); + border-radius:30%; +} + +p { +} + +a { + color: var(--theme-color-accent2); +} + +a:visited { + color: var(--theme-color-accent2); +} + +hr { + width: 100%; + margin-top: 2rem; + margin-bottom: 2rem; + color: var(--theme-color-accent2); +} + +main,aside { + padding:2.5rem; + max-width:80rem; + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: space-evenly; + padding:1rem; + +} +.listing { + width: 100%; + margin: 1rem; + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-start; +} + +.listing-preview { + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: flex-start; justify-content: center; } -main,aside{ - border:1px solid white; - display:flex; + +img, +video { + max-width: 95%; +} + +audio { + width: 100%; +} + +.metadata { + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: flex-start; + justify-content: center; +} + +.metadata>div { + margin: 1rem; +} + +.metadata p { + max-width: 20rem; +} + +.metadata-author { + padding: 0.5rem; + display: flex; flex-direction: column; - margin:1.5rem; - padding:1rem; + align-items: center; + flex-wrap: nowrap; } -main{ - min-width: 40%; - max-width: 60rem; + +.metadata-author>img { + max-width: 5rem; + border-radius: 3rem; } -aside{ - min-width: 30rem; -} -header,footer{ - width:100vw; - display:flex; + + +header { + text-align: center; + background-color: transparent; + display: flex; flex-direction: row; flex-wrap: wrap; align-items: center; - justify-content: center; + justify-content: space-evenly; + bottom: 0; } -nav{ - display:flex; + +nav { + display: flex; flex-direction: row; flex-wrap: wrap; - margin-left:10%; + align-items: center; + justify-content: space-evenly; } -nav>a{ + +nav>* { + margin: 1rem; +} + +section { + display:flex; + flex-direction: column; + align-items: center; + margin-top: 0.5rem; + margin-bottom: 0.5rem; + padding: 1.25rem; + border-radius: 1rem; + min-width: 30vw; +} + +article { + min-width: 30rem; + background-color: #000015b6; + margin-top: 1rem; + margin-bottom: 1rem; + padding: 0.5rem; + border-radius: 1rem; + box-shadow: 0 0 0.45rem var(--theme-color-accent); + display: flex; + flex-direction: column; + align-items: center; + + padding-left:10%; + padding-right:10%; +} + +blockquote { + margin-left: 10%; + padding-left: 5%; + border-left: 0.5rem solid var(--theme-color-accent2); + font-style: italic; +} + +section ul, +section ol, +article ol, +article ul { + width: 90%; +} + +article>a { + text-align: center; +} + +article h3, +section h3, +article h4, +section h4, +article h5, +article p { + width: 100%; +} + +article h3 { + text-decoration: underline; +} + +article img, +article video, +article iframe { + align-self: center; + max-width: 40rem; +} + +section iframe, +article iframe { + width: 80%; + height: 25rem; +} + +table{ + width:fit-content; +} +td, +th { + margin: 0; + border: 1px solid var(--theme-color-accent2); + padding: 0.5rem; + text-align: left !important; +} + +video{ + background-color:black; +} + +.link-preview{ + display:flex; + flex-direction: row; + flex-wrap: nowrap; + padding:1.5%; + justify-content: center; + text-decoration: none; + text-align: left; + max-width: 80%; +} +.link-preview>*{ + margin:0.5rem; +} +.link-preview>img{ + max-width: 20%; +} +.link-preview>div>p{ + text-decoration: none !important; + color: var(--theme-color-secondary); +} + +.listing img, +.listing video { + max-width:25rem; margin:1rem; } -a, -hr{ - color:var(--theme-accent-color); +aside .listing img{ + max-height: 15vh; } -hr{ - width:100%; - margin-top:1.5rem; - margin-bottom:1.5rem; -} \ No newline at end of file + +#sidebar { + padding:1rem; + padding-top:0; + margin:2rem; + margin-top:3rem; +} +.recent,.featured{ + width: 100%; + display: flex; + flex-direction: row; + align-items: flex-start; +} +.recent *, +.featured *{ + margin:0; + padding:0; +} +.recent img, +.featured img{ + max-width:20rem; + max-height:10rem; + margin:1rem; +} + +#social-links{ + display: flex; + flex-direction: row; + flex-wrap: wrap; +} + +.social-link{ + display:flex; + flex-direction: column; + align-items: center; + margin:1rem; +} + +.social-link img{ + width:5rem; +} + + + + + +@media print { + body{ + + background-color: white; + } + header,footer{ + display:none; + } + body>img{ + display:none; + } + img{ + max-height: 60vh; + } + *,main,section{ + color:black; + background-color: white; + border:none; + box-shadow: none; + padding:0; + max-width:100vw; + } + main{ + max-width:100vw; + + } + +} + + + + +@media screen and (orientation:portrait){ + main{ + flex-direction: column; + } +} +