From 966810c7730655e5db3c2d4b31afde4940acbae5 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Sat, 20 Apr 2024 14:55:20 -0600 Subject: .editorconfig for consistent whitespace --- .editorconfig | 11 +++ aux/nginx.conf | 4 +- cmd/generate/imworkingon.html.tmpl | 166 +++++++++++++++++----------------- public/imworkingon/imworkingon.scss | 164 ++++++++++++++++----------------- public/index.html | 176 ++++++++++++++++++------------------ public/sponsor/index.html | 134 +++++++++++++-------------- public/sponsor/sponsor.css | 68 +++++++------- 7 files changed, 368 insertions(+), 355 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..eab871e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = tab + +[*.yml] +indent_style = space +indent_size = 2 diff --git a/aux/nginx.conf b/aux/nginx.conf index 774c387..5bd4f6a 100644 --- a/aux/nginx.conf +++ b/aux/nginx.conf @@ -1,4 +1,4 @@ -# -*- Mode: nginx; nginx-indent-level: 8; indent-tabs-mode: t -*- +# -*- Mode: nginx -*- server { server_name www.lukeshu.com; @@ -22,7 +22,7 @@ server { } } location /avatar/ { - try_files $uri.png =404; + try_files $uri.png =404; } } diff --git a/cmd/generate/imworkingon.html.tmpl b/cmd/generate/imworkingon.html.tmpl index 6828002..fb24ac6 100644 --- a/cmd/generate/imworkingon.html.tmpl +++ b/cmd/generate/imworkingon.html.tmpl @@ -1,90 +1,90 @@ - - - Luke is working on… - - - - -
Luke T. Shumaker » imworkingon
+ + + Luke is working on… + + + + +
Luke T. Shumaker » imworkingon
-
-

Luke is working on
improving the GNU/Linux ecosystem

-

If you find this work valuable, please - consider sponsoring me.

-
+
+

Luke is working on
improving the GNU/Linux ecosystem

+

If you find this work valuable, please + consider sponsoring me.

+
-
-

Top themes

- {{- range $tagName, $tagInfo := .Tags }} -
-

#{{ $tagName }} : {{ $tagInfo.PrettyName }}

-
{{ $tagInfo.Desc | md2html }}
-
- {{- end }} -
+
+

Top themes

+ {{- range $tagName, $tagInfo := .Tags }} +
+

#{{ $tagName }} : {{ $tagInfo.PrettyName }}

+
{{ $tagInfo.Desc | md2html }}
+
+ {{- end }} +
-
-

In-progress work

- {{- range $contrib := .Contribs }} - {{- if or (eq $contrib.StatusClass "merged") (eq $contrib.StatusClass "released") }}{{ continue }}{{ end }} - {{ $upstream := $contrib | getUpstream }} -
-
{{ $upstream.Name }}
-
{{ $upstream.Desc | md2html }}
-
- {{- range $url := $contrib.URLs }} - {{ $url }}
- {{- end }} -
-
- {{- range $tag := $contrib.Tags }} - #{{ $tag }} {{/* */}} - {{- end }} -
-
Submitted: {{ timeTag $contrib.SubmittedAt "2006-01-02" }}
-
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ timeTag $contrib.LastUpdatedAt "2006-01-02" }}{{ end }}
-
Status: {{ $contrib.Status }}
-
- {{- $contrib.Desc | md2html }} - {{- if $contrib.SponsoredBy }}

Sponsored-by: {{ $contrib.SponsoredBy }}

{{ end -}} -
-
- {{- end }} -
-
-

Completed work

- {{- range $contrib := .Contribs }} - {{- if or (eq $contrib.StatusClass "merged") (eq $contrib.StatusClass "released") | not }}{{ continue }}{{ end }} - {{ $upstream := $contrib | getUpstream }} -
-
{{ $upstream.Name }}
-
{{ $upstream.Desc | md2html }}
-
- {{- range $url := $contrib.URLs }} - {{ $url }}
- {{- end }} -
-
- {{- range $tag := $contrib.Tags }} - #{{ $tag }} {{/* */}} - {{- end }} -
-
Submitted: {{ timeTag $contrib.SubmittedAt "2006-01-02" }}
-
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ timeTag $contrib.LastUpdatedAt "2006-01-02" }}{{ end }}
-
Status: {{ $contrib.Status }}
-
- {{- $contrib.Desc | md2html }} - {{- if $contrib.SponsoredBy }}

Sponsored-by: {{ $contrib.SponsoredBy }}

{{ end -}} -
-
- {{- end }} -
+
+

In-progress work

+ {{- range $contrib := .Contribs }} + {{- if or (eq $contrib.StatusClass "merged") (eq $contrib.StatusClass "released") }}{{ continue }}{{ end }} + {{ $upstream := $contrib | getUpstream }} +
+
{{ $upstream.Name }}
+
{{ $upstream.Desc | md2html }}
+
+ {{- range $url := $contrib.URLs }} + {{ $url }}
+ {{- end }} +
+
+ {{- range $tag := $contrib.Tags }} + #{{ $tag }} {{/* */}} + {{- end }} +
+
Submitted: {{ timeTag $contrib.SubmittedAt "2006-01-02" }}
+
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ timeTag $contrib.LastUpdatedAt "2006-01-02" }}{{ end }}
+
Status: {{ $contrib.Status }}
+
+ {{- $contrib.Desc | md2html }} + {{- if $contrib.SponsoredBy }}

Sponsored-by: {{ $contrib.SponsoredBy }}

{{ end -}} +
+
+ {{- end }} +
+
+

Completed work

+ {{- range $contrib := .Contribs }} + {{- if or (eq $contrib.StatusClass "merged") (eq $contrib.StatusClass "released") | not }}{{ continue }}{{ end }} + {{ $upstream := $contrib | getUpstream }} +
+
{{ $upstream.Name }}
+
{{ $upstream.Desc | md2html }}
+
+ {{- range $url := $contrib.URLs }} + {{ $url }}
+ {{- end }} +
+
+ {{- range $tag := $contrib.Tags }} + #{{ $tag }} {{/* */}} + {{- end }} +
+
Submitted: {{ timeTag $contrib.SubmittedAt "2006-01-02" }}
+
{{ if not $contrib.LastUpdatedAt.IsZero }}Last updated: {{ timeTag $contrib.LastUpdatedAt "2006-01-02" }}{{ end }}
+
Status: {{ $contrib.Status }}
+
+ {{- $contrib.Desc | md2html }} + {{- if $contrib.SponsoredBy }}

Sponsored-by: {{ $contrib.SponsoredBy }}

{{ end -}} +
+
+ {{- end }} +
- - + + diff --git a/public/imworkingon/imworkingon.scss b/public/imworkingon/imworkingon.scss index 5903704..55f7f85 100644 --- a/public/imworkingon/imworkingon.scss +++ b/public/imworkingon/imworkingon.scss @@ -2,107 +2,107 @@ @use 'sass:list'; * { - box-sizing: border-box; + box-sizing: border-box; } article { - border: solid 1px #333333; - border-radius: 1em; - margin: 0.5em; + border: solid 1px #333333; + border-radius: 1em; + margin: 0.5em; } div { - & > p:first-child { - margin-top: 0; - } - & > p:last-child { - margin-bottom: 0; - } + & > p:first-child { + margin-top: 0; + } + & > p:last-child { + margin-bottom: 0; + } } time { - text-decoration: dotted underline; + text-decoration: dotted underline; } code { - /* Don't let `--help` wrap as `--\nhelp`. */ - white-space: pre; + /* Don't let `--help` wrap as `--\nhelp`. */ + white-space: pre; } article.tag { - padding: 0.5em 2em; - & > h2 { - margin: 0 0 0.25em -1em; - } + 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"; - gap: 1px; - overflow: hidden; + 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"; + gap: 1px; + overflow: hidden; - & > div { - padding: 0.5em; - } - - @mixin color-panel { - background-color: #DDDDFF; - border: solid 1px #8D8DA6; - margin: -1px; - } + & > div { + padding: 0.5em; + } + + @mixin color-panel { + background-color: #DDDDFF; + border: solid 1px #8D8DA6; + margin: -1px; + } - div.contrib-upstream-name { - grid-area: uname; - @include color-panel; - text-align: center; - 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 { - grid-area: desc; - } + div.contrib-upstream-name { + grid-area: uname; + @include color-panel; + text-align: center; + 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 { + grid-area: desc; + } - &.closed-contrib div.contrib-status { background-color: #cf222e; color: white; } - &.open-contrib div.contrib-status { background-color: #d3ab3a; color: black; } - &.merged-contrib div.contrib-status { - background: repeating-linear-gradient(315deg, #1f883d, #1f883d 1.0em, #d3ab3a 1.0em, #d3ab3a 1.4em); - color: white; - $shadow: []; - @for $w from 1 through 3 { - @for $a from 0 to 24 { - $shadow: list.append($shadow, #{$w*math.cos($a*15deg)}px #{$w*math.sin($a*15deg)}px #1f883d); - }; - }; - text-shadow: list.join($shadow, [], $separator: comma, $bracketed: false); - } - &.released-contrib div.contrib-status { background-color: #1f883d; color: white; } + &.closed-contrib div.contrib-status { background-color: #cf222e; color: white; } + &.open-contrib div.contrib-status { background-color: #d3ab3a; color: black; } + &.merged-contrib div.contrib-status { + background: repeating-linear-gradient(315deg, #1f883d, #1f883d 1.0em, #d3ab3a 1.0em, #d3ab3a 1.4em); + color: white; + $shadow: []; + @for $w from 1 through 3 { + @for $a from 0 to 24 { + $shadow: list.append($shadow, #{$w*math.cos($a*15deg)}px #{$w*math.sin($a*15deg)}px #1f883d); + }; + }; + text-shadow: list.join($shadow, [], $separator: comma, $bracketed: false); + } + &.released-contrib div.contrib-status { background-color: #1f883d; color: white; } } diff --git a/public/index.html b/public/index.html index 8e4037e..05c7c31 100644 --- a/public/index.html +++ b/public/index.html @@ -23,136 +23,138 @@
-

Luke T. Shumaker

+

Luke T. Shumaker

- -

I am a programmer/hacker, - and an advocate of software freedom. I'm working on improving the - GNU/Linux-libre ecosystem!

+

I am a programmer/hacker, + and an advocate of software freedom. I'm working on improving the + GNU/Linux-libre ecosystem!

-

I've been a developer for the - Parabola GNU/Linux-libre - operating system since 2011, and am also doing lots - of other things to - improve the GNU/Linux ecosystem. If you like my work, please - consider sponsoring me so that I - can keep doing it.

+

I've been a developer for the + Parabola GNU/Linux-libre + operating system since 2011, and am also doing lots + of other things to + improve the GNU/Linux ecosystem. If you like my work, please + consider sponsoring me so that I + can keep doing it.

- -

Things to see here:

+

Things to see here:

- + -

Contact

+

Contact

-
diff --git a/public/sponsor/index.html b/public/sponsor/index.html index 2499b1f..a755371 100644 --- a/public/sponsor/index.html +++ b/public/sponsor/index.html @@ -1,82 +1,82 @@ - - Sponsor — Luke T. Shumaker - - - + + Sponsor — Luke T. Shumaker + + + -
Luke T. Shumaker » sponsor
-
+
Luke T. Shumaker » sponsor
+
-

Sponsor Luke

+

Sponsor Luke

-

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

+

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

- + -

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.

+

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:

+

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>.

+

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 T. Shumaker.

-

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

-
+
+ diff --git a/public/sponsor/sponsor.css b/public/sponsor/sponsor.css index f141260..811da06 100644 --- a/public/sponsor/sponsor.css +++ b/public/sponsor/sponsor.css @@ -1,76 +1,76 @@ /* generic */ a.donate-btn { - margin: 0.25em 0; + margin: 0.25em 0; - border-radius: 5px; - display: inline-block; - padding: 5px 7px 3px 7px; + border-radius: 5px; + display: inline-block; + padding: 5px 7px 3px 7px; - font-size: 14px; - font-weight: 700; - line-height: 22px; - text-decoration: none; + 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; + height: 16px; + margin-top: 2px; + margin-right: 3px; + vertical-align: top; } /* Liberapay */ a.donate-btn.liberapay { - background-color: #f6c915; - color: #1a171b; - font-family: Helvetica Neue,Helvetica,sans-serif; + background-color: #f6c915; + color: #1a171b; + font-family: Helvetica Neue,Helvetica,sans-serif; } a.donate-btn.liberapay:hover { - background-color: #fbce1a; + background-color: #fbce1a; } /* GitHub */ a.donate-btn.github { - background-color: #f6f8fa; - color: #24292f; - border: solid 1px #d0d7de; - font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif; + background-color: #f6f8fa; + color: #24292f; + border: solid 1px #d0d7de; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif; } a.donate-btn.github:hover { - background-color: #eef1f4; + background-color: #eef1f4; } /* Ko-fi */ a.donate-btn.kofi { - font-family: 'Quicksand',Helvetica,Century Gothic,sans-serif; - background-color: #29abe0; - color: #ffffff; + font-family: 'Quicksand',Helvetica,Century Gothic,sans-serif; + background-color: #29abe0; + color: #ffffff; } a.donate-btn.kofi:hover { - background-color: #48b7e4; + background-color: #48b7e4; } /* Patreon */ a.donate-btn.patreon { - background-color: #000000; - color: #ffffff; - border: solid 1px #000000; - font-weight: 400; + background-color: #000000; + color: #ffffff; + border: solid 1px #000000; + font-weight: 400; } a.donate-btn.patreon > span { - text-transform: uppercase; + text-transform: uppercase; } a.donate-btn.patreon > img { - filter: invert(100%); + filter: invert(100%); } a.donate-btn.patreon:hover { - background-color: #ffffff; - color: #000000; + background-color: #ffffff; + color: #000000; } a.donate-btn.patreon:hover > img { - filter: none; + filter: none; } -- cgit v1.2.3-2-g168b