From 5b504731dfe1ae0a72c1adfffcebbb7c37679eef Mon Sep 17 00:00:00 2001 From: Chris Vittal Date: Sun, 27 Oct 2019 06:12:18 -0400 Subject: [PATCH] Rewrite Everything --- .build.yml | 22 +++ README.md | 31 +++- config.toml | 4 + content/_index.md | 10 +- sass/style.scss | 206 +++++++++++++++------- static/favicon.ico | Bin 0 -> 4286 bytes templates/footer.html | 3 +- templates/head_tags.html | 1 + templates/header.html | 11 ++ templates/index.html | 42 ++--- templates/page.html | 28 +++ templates/shortcodes/fn.html | 1 + templates/shortcodes/fnref.html | 0 templates/shortcodes/renderfootnotes.html | 11 ++ 14 files changed, 271 insertions(+), 99 deletions(-) create mode 100644 .build.yml create mode 100644 static/favicon.ico create mode 100644 templates/header.html create mode 100644 templates/page.html create mode 100644 templates/shortcodes/fn.html create mode 100644 templates/shortcodes/fnref.html create mode 100644 templates/shortcodes/renderfootnotes.html diff --git a/.build.yml b/.build.yml new file mode 100644 index 0000000..6833e38 --- /dev/null +++ b/.build.yml @@ -0,0 +1,22 @@ +arch: null +environment: null +image: archlinux +packages: + - zola-bin +repositories: null +secrets: + - 6d8b1910-56af-421a-93e7-b01eb28aa0d3 +shell: false +sources: + - https://git.sr.ht/~cdv/chris.vittal.dev +tasks: + - setup: | + mkdir -p chris.vittal.dev/secrets + mv vars chris.vittal.dev/secrets/vars + - build: | + zola build + zola check +triggers: + - action: email + condition: always + to: Chris Vittal diff --git a/README.md b/README.md index 584090d..8822a2d 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,29 @@ # My Personal Website This is a website I made for just me. Mostly so I could have the email. But -Throwing up a tiny static site isn't bad either. +throwing up a tiny static site isn't bad either. + +Built with [Zola](https://getzola.org). + +## Building + +``` +zola build +``` + +## Testing + +```sh +zola serve +``` ## Licensing All _code_ here is licenced under the GNU Affero General Public License version -3 or (at your option) any later version. Code will be defined better as this -site grows. For now, it's the Makefile and configuration files, and this -README. A copy can be found in the `LICENSE-AGPLv3` file. - -All other _text_ content, notably the static html and markdown files, written -by us are licensed under a [Creative Commons -Attribution-NonCommercial-NoDerivatives 4.0 International -License](https://creativecommons.org/licenses/by-nc-nd/4.0/). +3. Code will be defined better as this site grows. For now, it's the Makefile +and configuration files, and this README. A copy can be found in the +`LICENSE-AGPLv3` file. + +All other _text_ content, notably the static html and markdown files, written by +me are licensed under a [Creative Commons Attribution-ShareAlike 4.0 +International License](https://creativecommons.org/licenses/by-sa/4.0/). diff --git a/config.toml b/config.toml index f609453..e8936e7 100644 --- a/config.toml +++ b/config.toml @@ -7,9 +7,13 @@ compile_sass = true # Whether to do syntax highlighting # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola highlight_code = true +highlight_theme = "gruvbox-dark" # Whether to build a search index to be used later on by a JavaScript library build_search_index = false +# build rss +generate_rss = true + [extra] # Put all your custom variables here diff --git a/content/_index.md b/content/_index.md index e4a1cbd..1ac8c81 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,10 +1,8 @@ +++ title = "Home" +sort_by = "date" +++ -This is a stub. I may add more, may not, dunno yet. - -## Welcome - -I'm Chris Vittal, and this is my personal website. I write free software, both -personally and professionally. +This is my blog/personal website. I develop free software. To see what I do on +company time, check out [hail](https://hail.is). Any opinions or perspectives +here are my own, not those of my employer. diff --git a/sass/style.scss b/sass/style.scss index ece5bd3..0a52c5c 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -1,76 +1,163 @@ -$bdy-font-stack: 'Open Sans', sans-serif; -$fg: #333; -$bg: #EEEEEE; +/* this is a nightmare of organization, abandon all hope designers who enter here */ +$bdy-font-stack: 'IBM Plex Mono', 'Fira Mono', monospace; +$fg: #222; +$bg: #EEE; +$subheading-light: #666; +$subheading-dark: #999; body{ font-family: $bdy-font-stack; - margin: 4px; - line-height: 1.4; font-size: 16px; + max-width: 850px; + padding: 4px; + margin: 0 auto; } -.container { - max-width: 1000px; - margin: 0 auto; - // FIXME: mobile - display: grid; - grid-template-columns: 3fr 1fr; +footer#copyright { + hr { + min-width: 100%; + } + + line-height: 1.1; + font-size: 12px; + + img { + vertical-align: middle; + } } -header { - grid-column: 1 / 3; +footer#article-footer { + margin: 4rem 0; + color: #555; + + a { + color: inherit; + } + + hr { + margin: 2rem auto; + border: none; + border-top: 1px solid grey; + max-width: 40px; + } } -main { - grid-column: 1; +ul.post-list { + list-style-type: none; + padding: 0; + + li { + h3 { + line-height: 1.5; + } + + time { + font-size: 1rem; + font-weight: normal; + padding-right: 1em; + } + } } -h1, h2, h3 { - line-height: 1.2 +.footnotes::before { + content: "Footnotes:"; } -hr#foot-border { - min-width: 100%; - grid-column: 1 / 3; +.footnotes { + margin-top: 3rem; + font-size: 0.75rem; + + p { + font-size: 1rem; + } } -footer { - line-height: 1.1; - font-size: 12px; - grid-column: 1; +code { + padding: 0.1em 0.2em; + background-color: #fcf0ca; + color: #407959; +} - img { - vertical-align: middle; + +@media only screen and (min-width: 520px) { + header.top-level { + display: grid; + grid-template-columns: auto auto; + grid-template-rows: auto auto; + + .subheading { + grid-row: 2; + grid-column: 1; + } + + h1 { + grid-row: 1; + grid-column: 1 / -1; + } + + nav { + grid-column: 2; + grid-row: 2; + } } } -ul { - list-style-type: none; - padding: 0; +header.top-level { + h1 { + margin-bottom: 0px; + a { + text-decoration: none; + } + } + + nav { + font-size: 90%; + display: flex; + justify-content: flex-end; + + span.sep { + padding: 0 0.5em; + } + } + + margin-bottom: 2 * 0.67em; } -nav#sidebar { - padding-left: 1rem; - grid-column: 2; - line-height: 1.2; +article { + header.post { + h1 { margin: 0px; } - li { + margin: (1.5*0.83em) 0; display: flex; justify-content: space-between; - align-items: flex-end; - flex-flow: wrap; - margin-top: 1ex; - - span.context { - order: 99; - margin: 0; - font-size: small; - } - a { - font-size: 90%; + time { + align-self: flex-end; } } + + +} + +time { + color: $subheading-light; +} + +body { + color: $fg; + background-color: $bg; +} + +a { + color: #0266bf +} + +p { + text-align: justify; +} + +.subheading { + color: $subheading-light; } @media (prefers-color-scheme: dark) { @@ -79,29 +166,24 @@ nav#sidebar { background-color: $fg; } - a { - color: $bg; - } -} - -@media (prefers-color-scheme: light) { - body { - color: $fg; - background-color: $bg; + time { + color: $subheading-dark; } a { - color: $fg; + color: #70bcff; } -} -@media (prefers-color-scheme: no-preference) { - body { - color: $fg; - background-color: $bg; + .subheading { + color: $subheading-dark; } - a { - color: $fg; + code { + background-color: #28282888; + color: #8ec07c; + } + + footer#article-footer { + color: #AAA; } } diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..23afd04182b1bce69ed6731c8a3c0c4d49115aa8 GIT binary patch literal 4286 zcmc(j%a0vb5ytPm{WyL4ecvPGMf0xvtW51tnOMX+S<}Avm(zeuxj>hW3(6w3uS4M=dwv^dBXdX#6n}YQt zQ-0Gbcz$cY>82KAjqQ=!PkApJ^BjJp#7X=N?1AP6)ZJ*DGu5%3={M z=NZKnbB?mlyYk@^``T|<{~7=4XxEy)v2-+YKZTXv)w6!Y-v9>Pth1_XutAI|@ngT` zTC1v}A8ULmL&PTUZt+V~-*<@rVoz*rELdQmyx?0-p51@;n0B3g?#8K2r=4Tt7|1{NoycBMa2~*lBYDr^f|i~W zj<9eS-a*`C|1aME zye(!^_D{)A>HAe>?R-hWY)qUf@1(q&fq|B=ui$iDR92VKdfqRh@Mr%(4dB0gQ@)FW z94aTm9^XSsj=&-(e$`uDH`c>3`I+*2$-BPTH)F5F>r?v@W2oG=@N5@TD~X|P;MsI( z^Tl=R>K*o&T-d@_@|Y|4?4@T5IHCN@eo9;u$27OH!}k*39G}cuxU^Wzu}SSK55(Vg zYnv^Xa5J&8nSvkM0nY7g1NKu}?>=ESZ=dt5@;h+MIRXZCKeLiJBYDoKd+q5t5XV>r zJTGf7!>2(bQtRNRc;(q<$Gg-* z%lqUzFRf{pRyRwqVYLe@QgR;lt%}FCoZYl5SI@}P8qE!?1M={;Rns@{d4H%;a^<$g z17e8yU&C$PbN%30;FDGgKbr-=&p5}YwCJpyU9r0TGW>oX44;DY&)anQ$TkPRw1?mM zz~2AUzwG?EA7l3no?k@+e_(m@h9%*g{4|esPI{#}n6GxMCkMiJs5dyN+8|!#bpqGR zPW@u2`#i(99Ih1$@F32xOO0>X>%?xH{?xwo^dD@!`JpAnE4=fRh4!I^?k(Fr{0Z1y zwh4BV(V(jdT&Vj6bb{R6oFnw`J=o_+J%AKTrpd|HvrBgQ>Qi=h`xkca{`+?A z&hKpJqu_w3Tm-`nA>zu4jNujxtGunE7=ooZIY?GpW9abC^vWhxz3 zPtc+!6*IPdZLxqes{NwsY`r?N_0Bb0te+rvH{szfoLRz`OIGFZqWUiNb#AeKhB)uQ zzgzU=OT> zizWELYt2viuAWq+CEP%>;ZuRO6y?%p^SiEjWnEh&{y0MedbAW@`c3cq%D!_={PW%_ z474X2#4%uBJ`6sQOI?#!*;aqitRf99{8{PBR%_H3kLep{_(g9<-%IdsR?LN)%4UZh z?-Qf%PrRH92i@D|MYZEK>6l0}h?zR_x~6aFchz@Wq1)6;jt@Q;N^_a5vO2TH&Ka}G z33?lco)7PuO=HumQ?wjg@Kf`O?0a8QOf2cV_v#BSxQ@7<$nJJtl>HPJcScIGeabYGy3Mjl8B#Cvle)gL-p3QV9$*ES%ub2Jr~Z`mXmj#jl)VTgO6LUofYvp0vg8 z4eF2Yg^T(UZ!&Q}ScpRb92)5$Sa7ZH9$_mV9xw9#_#Wr!NHOak_OUr&!!_sfN4zeX zJ?dh`%<^3VS#qP +