From 7b3c3f0dfbc6fc634e810d4747f606438d3fcd68 Mon Sep 17 00:00:00 2001 From: Oliver Atkinson Date: Wed, 7 Feb 2024 16:08:16 -0700 Subject: [PATCH] init - lots of changes from lugo --- archetypes/default.md | 5 +- layouts/_default/baseof.html | 54 +++++++--------- layouts/partials/footer.html | 8 +++ layouts/partials/head.html | 19 ++++++ layouts/partials/header.html | 5 ++ layouts/partials/nav.html | 8 --- layouts/partials/taglist.html | 13 ---- layouts/shortcodes/img.html | 2 +- layouts/shortcodes/login.html | 14 ++++ layouts/shortcodes/post.html | 14 ++++ layouts/shortcodes/tagcloud.html | 3 - static/form.css | 61 +++++++++++++++++ static/style.css | 108 +++++++++++++++++++++++-------- 13 files changed, 228 insertions(+), 86 deletions(-) create mode 100644 layouts/partials/footer.html create mode 100644 layouts/partials/head.html create mode 100644 layouts/partials/header.html delete mode 100644 layouts/partials/nav.html delete mode 100644 layouts/partials/taglist.html create mode 100644 layouts/shortcodes/login.html create mode 100644 layouts/shortcodes/post.html delete mode 100644 layouts/shortcodes/tagcloud.html create mode 100644 static/form.css diff --git a/archetypes/default.md b/archetypes/default.md index 00e77bd..13d9021 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,6 +1,7 @@ --- title: "{{ replace .Name "-" " " | title }}" date: {{ .Date }} +description: "Example" +tags: [''] draft: true ---- - +--- \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 57e17ce..6f47fc8 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,36 +1,26 @@ - - {{ if not .IsHome }}{{ .Title | title }} | {{ end }}{{ .Site.Title }} - - - - {{ with .Site.Params.favicon }} - {{ end -}} - - {{ if isset .Params "tags" }} - {{ end -}} - - - - +{{ partial "head.html" . }} + -{{ if .Site.Menus.main }}{{ partial "nav.html" . }}{{ end -}} -
-

{{ block "title" . }}{{ end }}

-
-{{ block "main" . }} -{{ .Content }} -{{ end }} -{{ if .Param "nextprev" }}{{ partial "nextprev.html" . -}}{{ end -}} -{{ if .Param "taglist" }}{{ partial "taglist.html" . }}{{ end -}} -
-
-{{ block "footer" . }} - -{{ end }} + {{ block "header" . }} + {{ partial "header.html" . }} + {{ end }} +
+
+

+ {{ .Page.Title }} +

+
+
+ {{ block "main" . }} + {{ .Content }} + {{ end }} +
+ {{ block "footer" . }} + {{ partial "footer.html" . }} + {{ end }} +
- + + \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html new file mode 100644 index 0000000..a691bfb --- /dev/null +++ b/layouts/partials/footer.html @@ -0,0 +1,8 @@ +
+ \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html new file mode 100644 index 0000000..4df580b --- /dev/null +++ b/layouts/partials/head.html @@ -0,0 +1,19 @@ + +{{ if not .IsHome }}{{ .Title | title }} | {{ end }}{{ .Site.Title }} + + + +{{ with .Site.Params.favicon }} + +{{ end -}} + +{{ if isset .Params "tags" }} + +{{ end -}} +{{ if isset .Params "redirect" }} + +{{ end -}} + + + + \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html new file mode 100644 index 0000000..7fc58f1 --- /dev/null +++ b/layouts/partials/header.html @@ -0,0 +1,5 @@ +
+

+ {{ .Site.Title }} +

+
\ No newline at end of file diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html deleted file mode 100644 index a7318fe..0000000 --- a/layouts/partials/nav.html +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/layouts/partials/taglist.html b/layouts/partials/taglist.html deleted file mode 100644 index 757db6f..0000000 --- a/layouts/partials/taglist.html +++ /dev/null @@ -1,13 +0,0 @@ - {{- if isset .Params "tags" -}} - {{- $tagsLen := len .Params.tags -}} - {{- if gt $tagsLen 0 -}} -
- {{- with .Site.Params.relatedtext }}{{ . }}
{{ end -}} - {{- range $k, $v := .Params.tags -}} - {{- $url := printf "tags/%s" (. | urlize | lower) -}} - {{ . | title }} - {{- if lt $k (sub $tagsLen 1) }} · {{ end -}} - {{- end -}} -
- {{- end -}} - {{- end }} diff --git a/layouts/shortcodes/img.html b/layouts/shortcodes/img.html index ff7959b..d5698f5 100644 --- a/layouts/shortcodes/img.html +++ b/layouts/shortcodes/img.html @@ -7,7 +7,7 @@ -->
{{- with .Get "link"}}{{ end -}} - {{.}} diff --git a/layouts/shortcodes/login.html b/layouts/shortcodes/login.html new file mode 100644 index 0000000..86f9fa0 --- /dev/null +++ b/layouts/shortcodes/login.html @@ -0,0 +1,14 @@ +
+{% if user %} + Welcome {{/* user */}}! +{% else %} + +
+ +
+
+
+ +
+{% endif %} +
\ No newline at end of file diff --git a/layouts/shortcodes/post.html b/layouts/shortcodes/post.html new file mode 100644 index 0000000..7be0c96 --- /dev/null +++ b/layouts/shortcodes/post.html @@ -0,0 +1,14 @@ + +
+ +

Markdown is supported!

+ + +
\ No newline at end of file diff --git a/layouts/shortcodes/tagcloud.html b/layouts/shortcodes/tagcloud.html deleted file mode 100644 index 0cf0118..0000000 --- a/layouts/shortcodes/tagcloud.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ if isset .Site.Taxonomies "tags" }}{{ if not (eq (len .Site.Taxonomies.tags) 0) }} {{ end }}{{ end }} diff --git a/static/form.css b/static/form.css new file mode 100644 index 0000000..1cf2d70 --- /dev/null +++ b/static/form.css @@ -0,0 +1,61 @@ +input { + color: #ffffff; + margin: 0.2rem; +} + +textarea:focus, input:focus { + outline-width: 0.2rem; + outline-style: solid; +} + +textarea:focus { + outline-color: #222222; +} + +input:focus { + outline-color: white; +} + +input[type="submit"]:focus { + outline-color: #344a70; +} + +input[type="submit"] { + background-color: #344a70; + text-align: center; +} + +input[type="password"], [type="text"] { + background-color: #ffffff; + color: #222222; +} + +/* input[value="Post"] { +} */ + +textarea, input { + border-radius: 0.5rem; + border-style: hidden; + padding: 0.75rem; +} + +textarea { + background-color: #222222; + border-style: solid; + border-width: 0; + resize: none; + color: white; + scrollbar-width: 0; + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + font-family: inherit; + font-size: inherit; + font-weight: inherit; +} + +textarea > ::placeholder { + color: #717171; + opacity: 1; +} diff --git a/static/style.css b/static/style.css index d3b2088..c754f09 100644 --- a/static/style.css +++ b/static/style.css @@ -1,45 +1,99 @@ +::-webkit-scrollbar { + width: 0; +} + body { - font-family: sans-serif ; - background: #110000 ; - color: #ccc ; + background-color: #222222; + color: #ffffff; + font-family: Arial, Helvetica, sans-serif; + margin: 0; + font-size: large; } -main { - max-width: 800px ; - margin: auto ; +header { + background-color: #344a70; + margin-top: 0; + margin-left: 0; + text-align: center; + padding: 0.75rem; + font-size: xx-large; } -img { - max-width: 100% ; +.article-header { + background-color: #454545; + margin: 2rem; + margin-bottom: 0; + border-top-right-radius: 0.5rem; + border-top-left-radius: 0.5rem; } -header h1 { - text-align: center ; +.spaced { + margin: 0; + padding: 1rem; +} + +article { + background-color: #303030; + padding: 1.5rem; + margin-left: 2rem; + margin-right: 2rem; + text-align: left; + border-bottom-left-radius: 0.5rem; + border-bottom-right-radius: 0.5em; +} + +hr { + margin: 2rem; + height: 1px; + border: 0; + border-top: 1px solid #454545; + height: 1px; } footer { - text-align: center ; - clear: both ; + color: #606060; + text-align: center; } -/* For TAGLIST.HTML */ -.taglist { - text-align: center ; - clear: both ; +p { + margin-left: 1rem; + margin-right: 1rem; + margin-top: 0; } -/* For NEXTPREV.HTML */ -#nextprev { - /* The container for both the previous and next articles. */ +h1,h2,h3,h4,h5,h6 { + margin: 0; + text-align: center; } -#prevart { - float: left ; - text-align: left ; + +a { + color: #3e765d; } -#nextart { - float: right ; - text-align: right ; + +a:hover { + color: #344a70; + text-decoration-line: none; } -#nextart,#prevart { - max-width: 33% ; + +header a { + color: inherit; + text-decoration-line: none; + font-weight: normal; } + +header a:hover { + font-weight: bold; + color: inherit +} + +main { + max-width: 80%; + margin: auto; +} + +@media screen and (max-width: 900px) { +main { + max-width: 100%; + margin: auto; +} +} \ No newline at end of file