paritybit.ca

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 62e2746d5569fd80bb68ec3425c9fab9447d69c7
parent ee31ce9107eb98a156ade5127e5fd3d81d66fb11
Author: Jake Bauer <jbauer@paritybit.ca>
Date:   Mon, 16 Dec 2019 02:08:09 -0500

Merge branch 'master' of git.sr.ht:~jbauer/paritybit.ca

Diffstat:
Mbuild/base.css | 22+++++++++++++++-------
Mbuild/footer.html | 6+++---
Mbuild/header.html | 4++--
Mcreatepages.sh | 11+++++++----
Mpages/about-site.md | 19++++++++++++++++---
Mpages/blog.md | 2+-
Mpages/blog/other-blogs.md | 3+++
Mpages/guides.md | 2+-
Mpages/home.md | 2+-
Mpages/projects.md | 2+-
Mpages/projects/dnd/initiative.md | 8++++----
Mpages/projects/dnd/roll.md | 2+-
Mpublic/feeds/guides-feed.xml | 6+++---
Mpublic/feeds/sitewide-feed.xml | 4++--
Muploadwatch.sh | 2+-
15 files changed, 61 insertions(+), 34 deletions(-)

diff --git a/build/base.css b/build/base.css @@ -1,3 +1,7 @@ +html { + scroll-behavior: smooth; +} + body { font-family: "DejaVu Sans", sans-serif; background-color: #222; @@ -33,12 +37,9 @@ p.noindent { pre { font-family: "DejaVu Sans Mono", monospace; - /* Do word-wrapping in every browser for pre */ - white-space: -moz-pre-wrap; - white-space: -o-pre-wrap; - white-space: -pre-wrap; - white-space: pre-wrap; - word-wrap: break-word; + /* white-space: pre-wrap; */ + /* word-wrap: break-word; */ + overflow-x: auto; background-color: #424242; border: 3px #585858 solid; box-shadow: inset 0 0 0 2px rgba(40, 40, 40, 0.5); @@ -87,6 +88,14 @@ audio { height: 2.3em; } +img { + border: 0; +} + +hr { + width: 70%; +} + ul.inline { padding: .1em 0 .5em 0; margin: 0; @@ -202,7 +211,6 @@ kbd { text-align: left; background-color: #333; box-sizing: border-box; - -moz-box-sizing: border-box; } #side-bar ul { diff --git a/build/footer.html b/build/footer.html @@ -1,15 +1,15 @@ <!-- BEGINNING OF FOOTER --> </div> <div id="footer"> - <hr width="70%"> + <hr> <a class="debian-banner" href="https://www.debian.org"><img class="debian-banner" src="/img/debian-openlogo-75.png" - alt="Powered by Debian" border="0"></a> + alt="Powered by Debian"></a> <a class="eff-banner" href="https://www.eff.org/join"><img class="eff-banner" src="/img/eff-join2_0.png" - alt="Join the EFF!" border="0"></a> + alt="Join the EFF!"></a> <p id="contact-info"> To report any technical issues with the website or to leave a suggestion, please send an email to diff --git a/build/header.html b/build/header.html @@ -13,14 +13,14 @@ </div> <div id="side-bar"> <ul> - <li><a href="/">Home<a/></li> + <li><a href="/">Home</a></li> <li><a href="/blog">Blog</a> <ul> <li><a href="/blog/other-blogs">Blogroll</a></li> </ul> </li> <li><a href="/projects">Projects</a></li> - <li><a href="/guides">Guides<a/></li> + <li><a href="/guides">Guides</a></li> <li><a href="/about-site">About This Site</a></li> <li><a href="/about-me">About Me</a> <ul> diff --git a/createpages.sh b/createpages.sh @@ -167,18 +167,21 @@ for page in $@; do # Check if this is supposed to be a sub-sub-section & add 2x<ul> if echo "$sectionName" | grep -qi "^subsub:"; then sectionName=${sectionName:7} - sed -i "/toc-title/a <ul><ul><li><a href=\"#$sectionName\">$sectionName</a></li></ul></ul>" \ + sectionNameNS=$(sed -e 's/ //g' <<< "$sectionName") + sed -i "/toc-title/a <ul><ul><li><a href=\"#$sectionNameNS\">$sectionName</a></li></ul></ul>" \ $htmldir/$savepath/$pagename.html # Or a sub-section elif echo "$sectionName" | grep -qi "^sub:"; then sectionName=${sectionName:4} - sed -i "/toc-title/a <ul><li><a href=\"#$sectionName\">$sectionName</a></li></ul>" \ + sectionNameNS=$(sed -e 's/ //g' <<< "$sectionName") + sed -i "/toc-title/a <ul><li><a href=\"#$sectionNameNS\">$sectionName</a></li></ul>" \ $htmldir/$savepath/$pagename.html # Or just a regular section else - sed -i "/toc-title/a <li><a href=\"#$sectionName\">$sectionName</a></li>" \ + sectionNameNS=$(sed -e 's/ //g' <<< "$sectionName") + sed -i "/toc-title/a <li><a href=\"#$sectionNameNS\">$sectionName</a></li>" \ $htmldir/$savepath/$pagename.html - sed -i "/<h3>$sectionName<\/h3>/i <a name=\"$sectionName\"></a>" \ + sed -i "/<h3>$sectionName<\/h3>/i <a id=\"$sectionNameNS\"></a>" \ $htmldir/$savepath/$pagename.html fi done diff --git a/pages/about-site.md b/pages/about-site.md @@ -106,13 +106,26 @@ Average downtime: 3 minutes and 50 seconds Current uptime: 5 minutes and 31 seconds since 01:53:56 10/08/19 </code></pre> +<p> + <a href="https://jigsaw.w3.org/css-validator/"> + <img style="border:0;width:88px;height:31px" + src="img/vcss.gif" + alt="Valid CSS!" /> + </a> + <a href="https://validator.w3.org/feed/"> + <img style="border:0;width:88px;height:31px" + src="img/valid-rss-rogers.png" + alt="Valid RSS Feeds!" /> + </a> +</p> + ### References -<a name=1></a> +<a id=1></a> [1] [The Git Repository For This Website](https://git.sr.ht/~jbauer/paritybit.ca) -<a name=2></a> +<a id=2></a> [2] [Drew DeVault's Article on Website Design](https://drewdevault.com/2018/09/04/Conservative-web-development.html) -<a name=3></a> +<a id=3></a> [3] [CSS Minifier Service](https://cssminifier.com) diff --git a/pages/blog.md b/pages/blog.md @@ -7,7 +7,7 @@ [//]: # "2019" <a class="rss-icon" href="/feeds/blog-feed.xml"> <img -src="/img/feed-icon.png" width="15px" height="15px" alt="RSS_ICON"</img> +src="/img/feed-icon.png" width="15" height="15" alt="Click for RSS"/> Subscribe to this page!</a> This is the place where I put all of my ramblings, rants, essays, and random diff --git a/pages/blog/other-blogs.md b/pages/blog/other-blogs.md @@ -67,6 +67,9 @@ then you'll probably also be interested in what these folks have to say: * [Kuketz IT-Security](https://www.kuketz-blog.de/) — <b>[DE]</b> Topics include: System administration, security, and hacking. +* [Lev's Hacking Notes](https://dev.levlaz.org/) – <b>[EN]</b> Topics include: + Computing, technology, and OpenBSD. + * [Matthias Ott's Blog](https://matthiasott.com/articles) – <b>[EN]</b> Topics include: Software engineering, privacy, software design and more. diff --git a/pages/guides.md b/pages/guides.md @@ -7,7 +7,7 @@ [//]: # <a class="rss-icon" href="/feeds/guides-feed.xml"> <img -src="/img/feed-icon.png" width="15px" height="15px" alt="RSS_ICON"</img> +src="/img/feed-icon.png" width="15" height="15" alt="Click for RSS"/> Subscribe to this page!</a> This is the place where I put things like tips and tricks on software diff --git a/pages/home.md b/pages/home.md @@ -17,7 +17,7 @@ below. There may be something that interests you. <div class="feed-wrapper"> <h3 class="feed-candidate">Recently Updated:</h3> <a class="rss-icon" href="/feeds/sitewide-feed.xml"> <img - src="/img/feed-icon.png" width="15px" height="15px" alt="RSS_ICON"></img> + src="/img/feed-icon.png" width="15" height="15" alt="Click for RSS"/> </a> </div> diff --git a/pages/projects.md b/pages/projects.md @@ -7,7 +7,7 @@ [//]: # <a class="rss-icon" href="/feeds/projects-feed.xml"> <img -src="/img/feed-icon.png" width="15px" height="15px" alt="RSS_ICON"</img> +src="/img/feed-icon.png" width="15px" height="15px" alt="Click for RSS"/> Subscribe to this page!</a> Below is a selection of links to my various projects and places where you can diff --git a/pages/projects/dnd/initiative.md b/pages/projects/dnd/initiative.md @@ -6,7 +6,7 @@ [//]: # -<script type="text/javascript" src=/js/initiative.js></script> +<script src=/js/initiative.js></script> <noscript>Your browser must support or enable Javascript for this applet to function.</noscript> @@ -22,10 +22,10 @@ lowest initiative value.</p> <div id="add-char"> <form> - <input id="char-name" type="text" placeholder="Character Name"></input> - <input id="init-val" type="number" placeholder="0"></input> + <input id="char-name" type="text" placeholder="Character Name"/> + <input id="init-val" type="number" placeholder="0"/> </form> -<button onClick=addChar() id="add-char">Add Character</button> +<button onClick=addChar()>Add Character</button> </div> <div class="initiative-list" id="initiative-list"> </div> diff --git a/pages/projects/dnd/roll.md b/pages/projects/dnd/roll.md @@ -6,7 +6,7 @@ [//]: # -<script type="text/javascript" src=/js/roll.js></script> +<script src=/js/roll.js></script> <noscript>Your browser must support or enable Javascript for this applet to function</noscript> diff --git a/public/feeds/guides-feed.xml b/public/feeds/guides-feed.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> -<atom:link href="https://www.paritybit.ca/feeds/guide-feed.xml" rel="self" type="application/rss+xml" /> +<atom:link href="https://www.paritybit.ca/feeds/guides-feed.xml" rel="self" type="application/rss+xml" /> <title>paritybit.ca — Guides</title> <link>https://www.paritybit.ca/guides</link> <description>The feed that covers all notable additions and updates to the Guides section of paritybit.ca. </description> <item> <title>New Guide: Using the "rm" Command with Trash</title> - <link>https://www.paritybit.ca/guides/debian-with-btrfs</link> - <guid>https://www.paritybit.ca/guides/debian-with-btrfs</guid> + <link>https://www.paritybit.ca/guides/using-rm-with-trash</link> + <guid>https://www.paritybit.ca/guides/using-rm-with-trash</guid> <pubDate>Tue, 26 Nov 2019 18:05:00 +0000</pubDate> <description>This guide will show you how to make `rm` remove a file to the Trash folder first so that you can prevent yourself from accidentally diff --git a/public/feeds/sitewide-feed.xml b/public/feeds/sitewide-feed.xml @@ -8,8 +8,8 @@ and other changes for the entire paritybit.ca website.</description> <item> <title>New Guide: Using the "rm" Command with Trash</title> - <link>https://www.paritybit.ca/guides/debian-with-btrfs</link> - <guid>https://www.paritybit.ca/guides/debian-with-btrfs</guid> + <link>https://www.paritybit.ca/guides/using-rm-with-trash</link> + <guid>https://www.paritybit.ca/guides/using-rm-with-trash</guid> <pubDate>Tue, 26 Nov 2019 18:05:00 +0000</pubDate> <description>This guide will show you how to make `rm` remove a file to the Trash folder first so that you can prevent yourself from accidentally diff --git a/uploadwatch.sh b/uploadwatch.sh @@ -6,4 +6,4 @@ WATCHDIR=/home/manager/uploads/ mkdir -p "$WATCHDIR" touch /home/manager/upload.log -find "$WATCHDIR" -mindepth 1 -maxdepth 1 -exec sh -c 'if [ ! "$1" = "" ]; then chown -R www-data:www-data "$1" && echo "==========" >> /home/manager/upload.log && rsync -vr "$1" "$2" >> /home/manager/upload.log && rm -r $1; fi' - {} "$DESTDIR" \; +find "$WATCHDIR" -mindepth 1 -maxdepth 1 -exec sh -c 'if [ ! "$1" = "" ]; then echo "==========" >> /home/manager/upload.log && rsync -vr "$1" "$2" >> /home/manager/upload.log && rm -r $1 && chown -R www-data:www-data "$2"; fi' - {} "$DESTDIR" \;