From 3c46bd7b2f61fec1f5719d73d88c3553a6862d52 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sun, 14 Apr 2024 10:38:36 -0600 Subject: wip --- .gitignore | 6 ++- Makefile | 39 +++++++++++++++- cmd/generate/imworkingon.html.tmpl | 89 +----------------------------------- cmd/generate/main.go | 2 +- public/donate.css | 62 ------------------------- public/donate.html | 51 --------------------- public/imworkingon/imworkingon.scss | 77 +++++++++++++++++++++++++++++++ public/index.html | 53 +++++++++++++++------ public/sponsor/index.html | 77 +++++++++++++++++++++++++++++++ public/sponsor/kofi-icon.png | Bin 0 -> 7958 bytes public/sponsor/liberapay-icon.svg | 1 + public/sponsor/patreon-icon.svg | 3 ++ public/sponsor/sponsor.css | 64 ++++++++++++++++++++++++++ 13 files changed, 307 insertions(+), 217 deletions(-) delete mode 100644 public/donate.css delete mode 100644 public/donate.html create mode 100644 public/imworkingon/imworkingon.scss create mode 100644 public/sponsor/index.html create mode 100644 public/sponsor/kofi-icon.png create mode 100644 public/sponsor/liberapay-icon.svg create mode 100644 public/sponsor/patreon-icon.svg create mode 100644 public/sponsor/sponsor.css diff --git a/.gitignore b/.gitignore index 8c6db60..b8aeca5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ -/public/imworkingon.html +/.sass-cache/ + +/public/imworkingon/index.html +/public/imworkingon/imworkingon.css +/public/imworkingon/imworkingon.css.map diff --git a/Makefile b/Makefile index 0f15fd5..82d7d1b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,39 @@ -public/imworkingon.html: FORCE - go run ./cmd/generate +build/files = public/imworkingon/index.html +build/files += public/imworkingon/imworkingon.css + +generate/files = public/sponsor/liberapay-icon.svg +generate/files += public/sponsor/kofi-icon.png +generate/files += public/sponsor/patreon-icon.svg + +################################################################################ + +all: build +.PHONY: all .PHONY: FORCE +.DELETE_ON_ERROR: +.NOTINTERMEDIATE: + +build: generate $(build/files) +clean: + rm -f -- $(build/files) +.PHONY: build clean + +generate: $(generate/files) +generate-clean: + rm -f -- $(generate/files) +.PHONY: generate generate-clean + +################################################################################ + +public/imworkingon/index.html: FORCE + go run ./cmd/generate +public/imworkingon/imworkingon.css: public/imworkingon/imworkingon.scss + scss $< $@ + +public/sponsor/liberapay-icon.svg: + curl -L https://liberapay.com/assets/liberapay/icon-v2_black.svg >$@ +public/sponsor/kofi-icon.png: + curl -L https://storage.ko-fi.com/cdn/cup-border.png >$@ +public/sponsor/patreon-icon.svg: + curl -L https://theme.zdassets.com/theme_assets/421814/642051a1900f62924e9512621d2f1838988e9245.svg >$@ diff --git a/cmd/generate/imworkingon.html.tmpl b/cmd/generate/imworkingon.html.tmpl index 1350e73..6b5016a 100644 --- a/cmd/generate/imworkingon.html.tmpl +++ b/cmd/generate/imworkingon.html.tmpl @@ -3,93 +3,8 @@ Luke is working on - - + +
diff --git a/cmd/generate/main.go b/cmd/generate/main.go index ab6409a..d6279ba 100644 --- a/cmd/generate/main.go +++ b/cmd/generate/main.go @@ -83,7 +83,7 @@ func mainWithError() error { }); err != nil { return err } - if err := os.WriteFile("public/imworkingon.html", out.Bytes(), 0666); err != nil { + if err := os.WriteFile("public/imworkingon/index.html", out.Bytes(), 0666); err != nil { return err } return nil diff --git a/public/donate.css b/public/donate.css deleted file mode 100644 index 49be209..0000000 --- a/public/donate.css +++ /dev/null @@ -1,62 +0,0 @@ -/* generic */ - -fieldset > a.donate-btn { - width: calc(100% - 1em); -} - -a.donate-btn { - margin: 0.25em 0; - - border-radius: 5px; - display: inline-block; - padding: 5px 7px 3px 7px; - - font-size: 14px; - font-weight: 700; - line-height: 22px; - text-decoration: none; -} -a.donate-btn > img { - height: 16px; - margin-top: 2px; - margin-right: 3px; - vertical-align: top; -} -a.donate-btn > span { - vertical-align: top; -} - -/* Liberapay */ - -a.donate-btn.liberapay { - background-color: #f6c915; - color: #1a171b; - font-family: Helvetica Neue,Helvetica,sans-serif; -} -a.donate-btn.liberapay:hover { - background-color: #fbce1a; -} - -/* Ko-fi */ - -a.donate-btn.kofi { - font-family: 'Quicksand',Helvetica,Century Gothic,sans-serif; - background-color: #29abe0; - color: #ffffff; -} -a.donate-btn.kofi:hover { - background-color: #48b7e4; -} - -/* Patreon */ - -a.donate-btn.patreon { - background-color: #000000; - color: #ffffff; - text-transform: uppercase; - outline: solid 1px #000000; -} -a.donate-btn.patreon:hover { - background-color: #ffffff; - color: #000000; -} diff --git a/public/donate.html b/public/donate.html deleted file mode 100644 index 8dc33f3..0000000 --- a/public/donate.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Donate — Luke Shumaker - - - -
- -

Donate to Luke T. Shumaker

- -

Hi, I'm Luke. I'm working on improving various aspects of the - GNU/Linux-libre ecosystem.

- -
    -
  • I'm working on the Parabola GNU/Linux-libre distro
    • -
  • I'm working on improving btrfs
    • -
  • I'm working on better tooling around cross-language-runtime - objects (GObject Introspection, which is a terrible name for what - it is, BTW)
    • -
  • I'm working improving Hi-DPI/variable-DPI support
    • -
  • ... and more!
    • -
- -

Please consider sponsoring my work, so I can continue putting so -much time and effort in to these things. Otherwise, I'm going to have -to cut back my activities by at least 50% in the next year.

- -

There are several ways you can sponsor me:

- - - -

It is my understanding that donating with Patreon or Ko-fi requires -Javascript code that does not respect your computing freedom, while -Liberapay makes no such assault on your freedom. If you'd like to -support me, but can't use or don't want to use any of the above -platforms, reach out to me at <lukeshu@lukeshu.com>.

- -
-
-

The content of this page is Copyright © Luke Shumaker.

-

This page is licensed under the CC BY-SA-3.0 license.

-
- - diff --git a/public/imworkingon/imworkingon.scss b/public/imworkingon/imworkingon.scss new file mode 100644 index 0000000..99885f2 --- /dev/null +++ b/public/imworkingon/imworkingon.scss @@ -0,0 +1,77 @@ +article { + border: solid 1px #333333; + border-radius: 1em; + margin: 0.5em; +} + +div { + & > p:first-child { + margin-top: 0; + } + & > p:last-child { + margin-bottom: 0; + } +} + +article.tag { + padding: 0.5em 2em; + & > h2 { + margin: 0 0 0.25em -1em; + } +} + +article.contrib { + display: grid; + grid-template-columns: 25% 25% 25% 25%; + grid-template-areas: + "uname submitted updated status" + "uname url url url" + "uname tag tag tag" + "udesc desc desc desc"; + overflow: hidden; + + & > div { + padding: 0.5em; + } + + @mixin color-panel { + background-color: #DDDDFF; + border: solid 1px #8D8DA6; + } + + div.contrib-upstream-name { + grid-area: uname; + @include color-panel; + text-align: center; + font-weight: bold; + padding-top: 1em; + } + div.contrib-upstream-desc { + grid-area: udesc; + @include color-panel; + } + div.contrib-urls { + grid-area: url; + + padding-bottom: 0; + } + div.contrib-tags { + grid-area: tag; + padding-top: 0; + } + div.contrib-submitted { + grid-area: submitted; + @include color-panel; + } + div.contrib-updated { + grid-area: updated; + @include color-panel; + } + div.contrib-status { + grid-area: status; + @include color-panel; + } + div.contrib-desc { + @include color-panel; + } +} diff --git a/public/index.html b/public/index.html index 3c46e61..ab0ee42 100644 --- a/public/index.html +++ b/public/index.html @@ -4,30 +4,47 @@ Luke T. Shumaker's home page - + +

Luke T. Shumaker

-