From 7c12f0da2f0ed66c1e88415079157574ea4c9870 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 29 Nov 2019 19:18:48 -0500 Subject: [PATCH 1/1] add static contact page --- haunt.scm | 66 +++++++++++++++++++ license.html | 45 ------------- .../bandali-pubkey.txt | 0 static/style.css | 10 ++- 4 files changed, 74 insertions(+), 47 deletions(-) delete mode 100644 license.html rename bandali-pubkey.txt => static/bandali-pubkey.txt (100%) diff --git a/haunt.scm b/haunt.scm index 27f2719..db736a6 100644 --- a/haunt.scm +++ b/haunt.scm @@ -232,6 +232,71 @@ (li ,(aa "Proprietary Software Is Often Malware" "https://www.gnu.org/proprietary/proprietary.html")))))) +(define contact-page + (static-page + "Contact Information" + "contact.html" + `((h1 "Contact information") + (p "Email is by far my preferred method of communication. I may" + " be contacted at any of the following addresses (choose the" + " most closely related):") + (ul + (li "bandali@gnu.org") + (li "bandali@uwaterloo.ca") + (li "bandali@csclub.uwaterloo.ca")) + (p "If you want to send me GPG-encrypted mail, you can use my " + ,(aa "public key" "bandali-pubkey.txt") " with the" + " fingerprint " + (code "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") + ".") + (table + (tbody + (tr + (td "IRC") + (td "bandali on " ,(aa "freenode" "https://freenode.net") ", " + ,(aa "moznet" "https://wiki.mozilla.org/IRC") ", and " + ,(aa "oftc" "https://www.oftc.net"))) + (tr + (td "XMPP") + (td ,(aa "bandali@member.fsf.org" + "xmpp:bandali@member.fsf.org"))) + (tr + (td "Matrix") + (td ,(aa "@bandali:matrix.org" + "https://matrix.to/#/@bandali:matrix.org"))) + (tr + (td "Fediverse") + (td ,(aa "@bandali@pleroma.site" + "https://pleroma.site/bandali"))))) + (h2 "Elsewhere") + (p "You may also find me at a few other places online. Stricken" + " through accounts are those I don’t use anymore, unless" + " absolutely necessary.") + (ul + (li ,(aa "bandali" "https://libreplanet.org/wiki/User:Bandali") + " on LibrePlanet") + (li ,(aa "bandali" "https://emacsconf.org/bandali") + " on EmacsConf") + (li ,(aa "bandali" "https://savannah.gnu.org/users/bandali") + " on Savannah") + (li ,(aa "bandali" "https://git.sr.ht/~bandali") + " on Sourcehut") + (li ,(aa "bandali" "https://lobste.rs/u/bandali") + " on Lobsters") + (li ,(aa "bandali" "https://hackage.haskell.org/user/bandali") + " on Hackage") + (li ,(aa "bandali" "https://gitlab.com/bandali") + " on GitLab.com") + (li ,(aa "bandali" + "https://news.ycombinator.com/user?id=bandali") + " on HN") + (li ,(aa "bandali" "https://www.reddit.com/u/bandali") + " on reddit") + (li (del ,(aa "bandali0" "https://github.com/bandali0") + " on GitHub")) + (li (del ,(aa "bandali0" "https://twitter.com/bandali0") + " on Twitter")))))) + (define my-domain "bandali.eu.org") (site #:title "Amin Bandali" @@ -252,5 +317,6 @@ #:prefix "tags") (rss-feed #:file-name "feed.rss") + contact-page license-page (static-directory "static" ""))) diff --git a/license.html b/license.html deleted file mode 100644 index 7859711..0000000 --- a/license.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - Licensing Information | Amin Bandali - - - - -
-

License information for bandali.eu.org

-

- I strongly believe in - free culture - and that all creative works everywhere should be - free. -

- -

- Unless otherwise noted material on this site is licensed - under the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, - or (at your option) any later version. A copy of the license - is included at gpl-3.0.html. -

- -

- Some resources on free software and licenses: -

- - -
- - - diff --git a/bandali-pubkey.txt b/static/bandali-pubkey.txt similarity index 100% rename from bandali-pubkey.txt rename to static/bandali-pubkey.txt diff --git a/static/style.css b/static/style.css index 30caa64..c6dc21d 100644 --- a/static/style.css +++ b/static/style.css @@ -111,7 +111,7 @@ em { } table td { - padding: 0.3em 0; + padding: 0.2em 0.3em; } table td:first-child { padding-left: 0; @@ -125,6 +125,9 @@ tbody tr:hover { .post-list { width: 100%; } +.post-list td { + padding: 0.3em; +} .post-list td:nth-child(2) { text-align: right; } @@ -169,9 +172,12 @@ ul > li::before { h2 + ul, h2 + dl, h2 + table { margin-top: 1em; } -h2 + .post-list { +h2 + .post-list, table + h2 { margin-top: 0.7em; } +p + table { + margin-top: -0.3em; +} sup, sub { font-size: 0.85em; } sup { vertical-align: super; } -- 2.20.1