diff --git a/.gitignore b/.gitignore index dbe9c82..b5ca24c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.vscode/ \ No newline at end of file +/.hugo_build.lock +/public \ No newline at end of file diff --git a/README.md b/README.md index dbc4ae0..d526052 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,17 @@ - # Oliver's Hugo Theme + Fork of [lugo](https://github.com/LukeSmithxyz/lugo). Used for my personal website(s). -## get started +## Get started ```sh hugo new site new-site -cd new-site -git clone https://github.com/lukesmithxyz/lugo themes/lugo +cd new-site/ +git submodule add https://git.oliveratkinson.net/Oliver/lugo themes/lugo echo "theme = 'lugo'" >> config.toml -cp themes/lugo/static/style.css static/ ``` -## stuff +## Notes - Makes one RSS feed for the entire site at `/index.xml` - Stylesheet is in `/style.css` and includes some important stuff for partials. -- If a post is tagged, links to the tags are placed at the bottom of the post. -- `nextprev.html` adds links to the Next and Previous articles to the bottom of a page. -- `taglist.html` links all tags an article is tagged to for related content. diff --git a/config.toml b/config.toml index 9df13eb..90fc49e 100644 --- a/config.toml +++ b/config.toml @@ -6,6 +6,12 @@ languageCode = 'en-us' # "relatedtext" is the text that appears above the tag list at the bottom of pages. relatedtext = "Tags:" favicon = "favicon.ico" - showrss = true + + #list items + datesinlist = true + authorsinlist = true + + #footer items nextprev = true taglist = true + showrss = true \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 88db6f8..bfdb78a 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,47 +1,24 @@ - - {{ 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 -}} -
-
-

- {{ if .IsHome }} {{ .Site.Title }} {{ end }} - {{ block "title" . }} - {{ end }}

-

- {{ if not .IsHome }} {{ .Params.description }} {{ end }} -

-
-
-{{ block "main" . }} -{{ .Content }} -{{ end }} -{{ if not .IsHome }}

{{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/_default/list.html b/layouts/_default/list.html index 71121c3..feb681c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -6,13 +6,16 @@ {{ if not .IsHome }} {{- end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html new file mode 100644 index 0000000..5ea4cb8 --- /dev/null +++ b/layouts/partials/footer.html @@ -0,0 +1,7 @@ +
+ \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html new file mode 100644 index 0000000..d6610ff --- /dev/null +++ b/layouts/partials/head.html @@ -0,0 +1,20 @@ + +{{ 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..d3ab307 --- /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/nextprev.html b/layouts/partials/nextprev.html deleted file mode 100644 index 099f16d..0000000 --- a/layouts/partials/nextprev.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ if or .Next .Prev -}} -
-{{- with .Prev }} -
Previous:
{{.Title}}
 -{{ end -}} -{{- with .Next -}} -
Next:
{{.Title}}
 -{{ 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..9620cd0 --- /dev/null +++ b/layouts/shortcodes/login.html @@ -0,0 +1,10 @@ +
+ +
+ +
+
+
+ +
+
\ 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/roller.html b/layouts/shortcodes/roller.html new file mode 100644 index 0000000..55d0e34 --- /dev/null +++ b/layouts/shortcodes/roller.html @@ -0,0 +1,7 @@ + +
+{{ $s := $.Params }} +{{ range $k, $v := $s }} +

{{ $v }}

+{{ end }} +
\ 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..7e1df0c --- /dev/null +++ b/static/form.css @@ -0,0 +1,58 @@ +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; +} + +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/lugo.css b/static/lugo.css new file mode 100644 index 0000000..525cbc8 --- /dev/null +++ b/static/lugo.css @@ -0,0 +1,46 @@ + +/* For NEXTPREV.HTML */ +#nextprev { + /* The container for both the previous and next articles. */ + color: black; +} + +#nextprev a:any-link { + color: black; +} + +#nextart { + float: left ; + text-align: left ; +} + +#prevart { + float: right ; + text-align: right ; +} + +#nextart,#prevart { + max-width: 33% ; +} + +/* For TAGLIST.HTML */ +.taglist { + text-align: center; + clear: both; + color: rgb(64, 64, 64); +} + +/* For putting right / left boxes next to each other */ +.left { + width: 45%; + padding-right: 5%; + float: left; + clear: both; +} + +.right { + width: 45%; + padding-left: 5%; + float: right; +} + diff --git a/static/roller.css b/static/roller.css new file mode 100644 index 0000000..0091564 --- /dev/null +++ b/static/roller.css @@ -0,0 +1,71 @@ +.roller-container {display: grid; text-align: center;} +.roller0,.roller1,.roller2,.roller3,.roller4,.roller5{ + animation-iteration-count: infinite; + animation-timing-function: cubic-bezier(1, 0, 0, 1); + animation-duration: 6s; + animation-direction: normal; + transform-origin: center; + /* works with "display: grid" to have all the words in the same place on the screen. */ + grid-row: 1; + grid-column: 1; +} +.roller0 { animation-name: roll0; color: rgb(0, 182, 182)} +.roller1 { animation-name: roll1; color: rgb(173, 3, 154)} +.roller2 { animation-name: roll2; color: rgb(6, 179, 0)} +.roller3 { animation-name: roll3; color: rgb(211, 189, 0)} +.roller4 { animation-name: roll4; color: rgb(171, 0, 0)} +.roller5 { animation-name: roll5; color: rgb(255, 247, 0)} +@keyframes roll0 { + 100% { opacity: 1; transform: translateY(0) rotateX(0); } + 0% { opacity: 1; transform: translateY(0) rotateX(0); } + 17% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 34% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 51% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 68% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 85% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } +} +@keyframes roll1 { + 100% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 0% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 17% { opacity: 1; transform: translateY(0) rotateX(0); } + 34% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 51% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 68% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 85% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } +} +@keyframes roll2 { + 100% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 0% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 17% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 34% { opacity: 1; transform: translateY(0) rotateX(0); } + 51% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 68% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 85% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } +} +@keyframes roll3 { + 100% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 0% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 17% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 34% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 51% { opacity: 1; transform: translateY(0) rotateX(0); } + 68% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 85% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } +} +@keyframes roll4 { + 100% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 0% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 17% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 34% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 51% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 68% { opacity: 1; transform: translateY(0) rotateX(0); } + 85% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } +} +@keyframes roll5 { + 100% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 0% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 17% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 34% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 51% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 68% { opacity: 0; transform: translateY(2rem) rotateX(15deg); } + 85% { opacity: 1; transform: translateY(0) rotateX(0); } +} diff --git a/static/style.css b/static/style.css index e106246..92733ef 100644 --- a/static/style.css +++ b/static/style.css @@ -1,120 +1,108 @@ +.copy:hover { + color: #344a70; +} + +::-webkit-scrollbar { + width: 0; +} + body { - font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; - font-size: large; - background: rgb(71, 71, 71); - color: black; + background-color: #222222; + color: #ffffff; + font-family: Arial, Helvetica, sans-serif; + margin: 0; + font-size: x-large; } -main { - max-width: 75%; - margin: auto; +header { + background-color: #344a70; + margin-top: 0; + margin-left: 0; + text-align: center; + padding: 0.75rem; + font-size: xx-large; } -h1, h2, h3, h4 { - text-align: center; - flex: 100%; +.article-header { + background-color: #454545; + color: #707070; + margin: 2rem; + margin-bottom: 0; + border-top-right-radius: 0.5rem; + border-top-left-radius: 0.5rem; } -header h1 { - color: white; -} - -header h4 { - /* - The color half-way between the - background color and pure white - */ - color: rgb(163, 163, 163); -} - -a:link { - color: white; -} - -a:visited{ - color: rgb(174, 174, 174); -} - -article a:link { - color: rgb(0, 0, 0); -} - -article a:visited { - color: rgb(64, 64, 64); +.spaced { + margin: 0; + padding: 1rem; } article { - background-color: burlywood; - outline: cadetblue solid 5px; - padding: 3%; - border-radius: 10px; + 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 { - border-top: 2px solid cadetblue; - border-radius: 4px; -} - -br { - clear: both; -} - -pre { - /* - This has to be flagged important because somewhere in hugo a style - is being directly applied to pre blocks. Ill have to find it later. - */ - background-color: rgb(59, 59, 59) !important; - padding-top: 0px; - padding-bottom: 0px; - padding-left: 10px; - padding-right: 10px; - border-radius: 8px; - outline: cadetblue solid 3px; -} - -code { - font-size: large; - color: white; - /* - we need to re-define these - for times when a single backtick is used - */ - background-color: rgb(59, 59, 59); - padding-left: 3px; - padding-right: 3px; - padding-top: 1px; - border-radius: 4px; -} - -img { - border-radius: 4px; - margin: 0; -} - -figcaption { - color: rgb(69, 69, 69); - font-style: italic; - text-align: center; -} - -figure { - margin: 2%; + margin: 2rem; + height: 1px; + border: 0; + border-top: 1px solid #454545; + height: 1px; } footer { - padding-top: 2%; - text-align: center; - clear: both; + color: #606060; + text-align: center; } -footer a:any-link { - color: white; +p { + margin-left: 1rem; + margin-right: 1rem; + margin-top: 0; } -@media only screen and (max-width: 600px) { - main { - max-width: 90%; - } +h1,h2,h3,h4,h5,h6 { + margin: 0; + text-align: center; } +article h1 { + margin-bottom: 1rem; +} + +a { + color: #3e765d; +} + +a:hover { + color: #344a70; + text-decoration-line: none; +} + +header a { + color: inherit; + text-decoration-line: none; + font-weight: bold; +} + +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