From ca49a6a31514cdcd6288c90b740e349759990001 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:28:49 -0600 Subject: [PATCH 01/41] refactor: Remove deprecated scroll handler --- assets/scripts/scroll-effect.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/scroll-effect.js b/assets/scripts/scroll-effect.js index 42a4af8..3899449 100644 --- a/assets/scripts/scroll-effect.js +++ b/assets/scripts/scroll-effect.js @@ -1,4 +1,4 @@ -$(window).scroll(function (e) { +$(window).on("scroll", function (e) { oVal = $(window).scrollTop() / 170; $(".blur").css("opacity", oVal); }); -- 2.45.2 From 1a6519fafbe41f3fc365085f40c53f407fcd58e7 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 7 Nov 2024 08:38:34 -0600 Subject: [PATCH 02/41] refactor: Change blur image to be implemented in CSS --- assets/scripts/scroll-effect.js | 4 ++-- assets/styles/mix-twbs.scss | 4 ---- layouts/partials/scrolling-image-header.html | 5 ----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/assets/scripts/scroll-effect.js b/assets/scripts/scroll-effect.js index 3899449..9a082dd 100644 --- a/assets/scripts/scroll-effect.js +++ b/assets/scripts/scroll-effect.js @@ -1,5 +1,5 @@ $(window).on("scroll", function (e) { - oVal = $(window).scrollTop() / 170; - $(".blur").css("opacity", oVal); + oVal = $(window).scrollTop() / 75; + $(".blurred-container .img-src").css("filter", "blur(" + oVal + "px)"); }); $("#motto").fitText(); diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 5ffbaba..536f92e 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -48,10 +48,6 @@ $peek-height: 25rem; background-position: center center; } -.blur { - opacity: 0; -} - .list-main { position: relative; background-color: #fff; diff --git a/layouts/partials/scrolling-image-header.html b/layouts/partials/scrolling-image-header.html index 761786d..89eecb7 100644 --- a/layouts/partials/scrolling-image-header.html +++ b/layouts/partials/scrolling-image-header.html @@ -7,14 +7,9 @@ {{ $imgsrc := print "images/" (.Param "cardImage") ".jpg" }} {{ $mainimg := resources.Get $imgsrc }} - {{ $blurimg := $mainimg.Filter (images.GaussianBlur 100) }}
-

-- 2.45.2 From fe4995b0a916e3f13efe19254fed08afa468dfa2 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:53:34 -0600 Subject: [PATCH 03/41] refactor: Switch to pain CSS style sheet --- assets/styles/millironx.css | 47 ++++++++++++++++++++++++++++++++++++ layouts/_default/baseof.html | 4 +-- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 assets/styles/millironx.css diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css new file mode 100644 index 0000000..3b6bd97 --- /dev/null +++ b/assets/styles/millironx.css @@ -0,0 +1,47 @@ +:root { + /* + Color schemes + */ + color-scheme: light dark; + --prickly-pear-yellow: #735f02; + --eclipse-gray: #3a3a3a; + --pumpkin-olive: #59521c; + --manhattan-steel-blue: #224553; + --pine-green: #36581d; + --brown-swiss-calf-brown: #543c21; + --ear-tag-red: #67160e; + --flaming-gorge-blue: #1b3e5a; + --hayyard-green: #355322; + --coeurdalene-purple: #1b245a; + --brown-swiss-cow-brown: #563c1f; + --buffalo-blue: #0b496a; + --saddle-blue: #104165; + --brown-swiss-gray: #eaddca; + + /* + Fonts + */ + --font-family-antique: Superclarendon, "Bookman Old Style", "URW Bookman", + "URW Bookman L", "Georgia Pro", Georgia, serif; + --font-family-slab-serif: Rockwell, "Rockwell Nova", "Roboto Slab", + "DejaVu Serif", "Sitka Small", serif; + --font-family-system-ui: system-ui, sans-serif; + + /* + Breakpoint + */ + @property --responsive-breakpoint { + syntax: ""; + inherits: false; + initial-value: 768px; + } +} + +/* + Default element styles (for small screens) +*/ + +html { + background-color: light-dark(var(--brown-swiss-gray), var(--eclipse-gray)); + font-family: var(--font-family-slab-serif); +} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index ca745ee..6dfbc6c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,8 +8,8 @@ {{ end }} {{ .Title }} - {{ .Site.Title }} - {{ $twbssass := resources.Get "styles/mix-twbs.scss" }} - {{ $twbssass = $twbssass | resources.ToCSS | resources.PostCSS | minify | resources.PostProcess }} + {{ $twbssass := resources.Get "styles/millironx.css" }} + {{ $twbssass = $twbssass | resources.PostCSS | minify | resources.PostProcess }} -- 2.45.2 From 17987d145570e37c8463a58400952eec95a522cd Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:55:30 -0600 Subject: [PATCH 04/41] feat!: Remove layout JavaScript --- assets/scripts/scroll-effect.js | 5 ----- layouts/_default/baseof.html | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 assets/scripts/scroll-effect.js diff --git a/assets/scripts/scroll-effect.js b/assets/scripts/scroll-effect.js deleted file mode 100644 index 9a082dd..0000000 --- a/assets/scripts/scroll-effect.js +++ /dev/null @@ -1,5 +0,0 @@ -$(window).on("scroll", function (e) { - oVal = $(window).scrollTop() / 75; - $(".blurred-container .img-src").css("filter", "blur(" + oVal + "px)"); -}); -$("#motto").fitText(); diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 6dfbc6c..43bab93 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -104,10 +104,8 @@ {{ $jquery := resources.Get "scripts/jquery/jquery.min.js" }} {{ $jqmaskjs := resources.Get "scripts/jquery-mask-plugin/jquery.mask.min.js" }} - {{ $fittextjs := resources.Get "scripts/fittext/jquery.fittext.js" | minify }} - {{ $scrolljs := resources.Get "scripts/scroll-effect.js" | minify }} {{ $maskjs := resources.Get "scripts/phone-masking.js" | minify }} - {{ $jquerybundle := slice $jquery $jqmaskjs $fittextjs $scrolljs $maskjs | resources.Concat "js/jquery-bundle.js" }} + {{ $jquerybundle := slice $jquery $jqmaskjs $maskjs | resources.Concat "js/jquery-bundle.js" }} -- 2.45.2 From 7657de82772c48a8e90241def875b95449fd1b0b Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:11:50 -0600 Subject: [PATCH 05/41] refactor: Change site layout --- assets/styles/millironx.css | 67 +++++++++++++--- layouts/_default/baseof.html | 143 ++++++++++++++++------------------ layouts/partials/sidebar.html | 47 ++--------- 3 files changed, 130 insertions(+), 127 deletions(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 3b6bd97..d4682bb 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -26,15 +26,6 @@ --font-family-slab-serif: Rockwell, "Rockwell Nova", "Roboto Slab", "DejaVu Serif", "Sitka Small", serif; --font-family-system-ui: system-ui, sans-serif; - - /* - Breakpoint - */ - @property --responsive-breakpoint { - syntax: ""; - inherits: false; - initial-value: 768px; - } } /* @@ -45,3 +36,61 @@ html { background-color: light-dark(var(--brown-swiss-gray), var(--eclipse-gray)); font-family: var(--font-family-slab-serif); } + +header { + display: flex; + justify-content: space-evenly; + align-items: center; +} + +nav { + display: flex; + flex-direction: row; + overflow: scroll; + padding-bottom: 1rem; + position: sticky; + top: 0; +} + +/* + Container-type helper classes +*/ +.row { + display: flex; + flex-direction: column; + width: 100%; +} + +/* + Desktop screen size adjustments +*/ +@media (min-width: 768px) { + /* + Default element styles + */ + nav { + flex-direction: column; + padding-right: 1rem; + padding-bottom: 0; + + /* + Workaround for Chrome always showing scrollbar even when scrolling not needed + */ + -ms-overflow-style: none; + scrollbar-width: none; + } + + /* + Continued Chrome workaround + */ + nav::-webkit-scrollbar { + display: none; + } + + /* + Container-type helper classes + */ + .row { + flex-direction: row; + } +} /* end @media */ diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 43bab93..ce29c51 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -17,85 +17,72 @@ -
-
- {{ partial "sidebar" . }} -
-
-
-

- - Milliron X - -   Milliron X -

-
-
- {{ block "main" . }} -
-
- {{ .Content }} -
-
- {{ end }} -
- -
-
-
+
+ + Milliron X + +

Milliron X

+
+
+ {{ partial "sidebar" . }} +
+ {{ block "main" . }} + {{ .Content }} + {{ end }} +
+
+ +
{{ $fontawesome := resources.Get "scripts/fa-icons.js" | js.Build "js/fontawesome.js" | minify }} diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index ae469d4..c5e6473 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,48 +1,15 @@ {{ $millironx := resources.Get "graphics/millironx.svg" }} {{ $currentPage := . }} -- 2.45.2 From a0cbd61c0c5791b5258286c3e409c3e278aeb409 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:30:14 -0600 Subject: [PATCH 06/41] refactor: Reimplement basic styles --- assets/styles/millironx.css | 121 ++++++++++++++++++++++++++++++++ content/_index.html | 24 +++---- layouts/shortcodes/imgproc.html | 4 +- 3 files changed, 134 insertions(+), 15 deletions(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index d4682bb..fba1a0f 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -17,6 +17,7 @@ --buffalo-blue: #0b496a; --saddle-blue: #104165; --brown-swiss-gray: #eaddca; + --lavender-purple: #d9c1f6; /* Fonts @@ -37,6 +38,10 @@ html { font-family: var(--font-family-slab-serif); } +a { + color: light-dark(var(--saddle-blue), var(--lavender-purple)); +} + header { display: flex; justify-content: space-evenly; @@ -52,6 +57,70 @@ nav { top: 0; } +nav a { + color: light-dark(var(--brown-swiss-gray), var(--manhattan-steel-blue)); + background-color: light-dark( + var(--manhattan-steel-blue), + var(--brown-swiss-gray) + ); + border-radius: 0.05rem; + border-style: outset; + border-width: 0.2rem; + border-color: light-dark( + var(--manhattan-steel-blue), + var(--brown-swiss-gray) + ); + min-width: 7.5rem; + max-width: 7.5rem; + display: flex; + justify-content: space-between; + align-items: center; + margin: 0.2rem; + text-decoration: none; + padding: 0 0.2rem; + font-family: var(--font-family-system-ui); +} + +nav a:active { + border-style: inset; +} + +nav a:hover { + background-color: light-dark( + var(--buffalo-blue), + color-mix(in srgb, var(--prickly-pear-yellow), var(--brown-swiss-gray) 75%) + ); +} + +figure { + border-color: light-dark(var(--eclipse-gray), var(--brown-swiss-gray)); + border-width: 1.5pt; + border-style: inset; + padding: 1.25pt; +} + +blockquote { + background: linear-gradient( + to right, + light-dark(lightgray, dimgray), + color-mix( + in srgb, + light-dark(var(--brown-swiss-gray), var(--eclipse-gray)), + white 25% + ) + ); + border-left: 5px solid black; + padding-left: 6px; +} + +blockquote small::before { + content: "\2014 \00A0"; +} + +blockquote small { + font-size: 80%; +} + /* Container-type helper classes */ @@ -61,6 +130,45 @@ nav { width: 100%; } +/* + Helper classes +*/ +.font-small-caps { + font-variant-caps: small-caps; +} + +.img-fluid { + max-width: 100%; + height: auto; +} + +.float-left { + float: none; + max-width: 100%; +} + +.float-right { + float: none; + max-width: 100%; +} + +/* + Application-state helper classes +*/ +@media (prefers-color-scheme: light) { + .active { + background-color: var(--coeurdalene-purple); + } +} + +@media (prefers-color-scheme: dark) { + .active { + color: color-mix(in srgb, var(--manhattan-steel-blue), white 75%); + background-color: color-mix(in srgb, var(--brown-swiss-gray), black 75%); + border-color: color-mix(in srgb, var(--brown-swiss-gray), black 50%); + } +} + /* Desktop screen size adjustments */ @@ -93,4 +201,17 @@ nav { .row { flex-direction: row; } + + /* + Helper classes + */ + .float-left { + float: left; + max-width: 50%; + } + + .float-right { + float: right; + max-width: 50%; + } } /* end @media */ diff --git a/content/_index.html b/content/_index.html index 8df6adc..b33d6af 100644 --- a/content/_index.html +++ b/content/_index.html @@ -41,7 +41,7 @@ menu:

Who am I?

-{{% imgproc me-and-lady Resize "768x" "float-md-end w-md-50 p-3" %}} +{{% imgproc me-and-lady Resize "768x" "float-right" %}} Image courtesy [Guy McCutcheon Photography](https://www.guymccutcheon.com/) {{% /imgproc %}} @@ -74,7 +74,7 @@ Image courtesy [Guy McCutcheon Photography](https://www.guymccutcheon.com/)

Where am I?

-{{% imgproc wy-in-ks Resize "768x" "float-md-start w-md-50 p-3" / %}} +{{% imgproc wy-in-ks Resize "768x" "float-left" / %}}

@@ -127,23 +127,21 @@ Around the web you can find me at (in order of subjective importance) not use it as fodder to try and "follow" me on each of these platforms. I stand with RMS:

-
-
-

- Facebook is a bad place for a person to be. When people find us on - Facebook, we lead them away from Facebook and then talk with them - elsewhere. -

-
- -
+ +

I typically don't respond to inqueries made on these platforms. Please use my contact form, instead. diff --git a/layouts/shortcodes/imgproc.html b/layouts/shortcodes/imgproc.html index f83f908..0b03338 100644 --- a/layouts/shortcodes/imgproc.html +++ b/layouts/shortcodes/imgproc.html @@ -14,9 +14,9 @@ {{ else }} {{ errorf "Invalid image processing command: Must be one of Crop, Fit, Fill or Resize." }} {{ end }} -

+
Date: Wed, 20 Nov 2024 11:36:54 -0600 Subject: [PATCH 07/41] feat: Add image banner back --- assets/styles/millironx.css | 39 ++++++++++++++++++++ layouts/partials/scrolling-image-header.html | 27 +++++++++----- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index fba1a0f..cd9d974 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -130,6 +130,45 @@ blockquote small { width: 100%; } +.motto { + position: relative; + display: grid; + place-items: center; + text-align: center; + color: #fff; + font-weight: 600; + text-shadow: 0 0 10px rgba(0, 0, 0, 0.33); + width: 100%; + padding: 0 0 0.5em 0; + border-radius: 0.25rem; +} + +.motto::before { + content: " "; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + box-sizing: border-box; + background-size: cover; + background-position: 50% 50%; +} + +.motto-inside { + position: relative; + max-width: 95%; + display: grid; + place-items: center; + text-align: center; +} + +.motto .motto-inside h1 { + background-color: rgba(0.33, 0.33, 0.33, 0.33); + -webkit-text-stroke: 0.3px lightgray; + line-height: 1; +} + /* Helper classes */ diff --git a/layouts/partials/scrolling-image-header.html b/layouts/partials/scrolling-image-header.html index 89eecb7..ef35399 100644 --- a/layouts/partials/scrolling-image-header.html +++ b/layouts/partials/scrolling-image-header.html @@ -1,15 +1,22 @@ -{{ $millironx := resources.Get "graphics/millironx.svg" }} -
-
+{{ $imgsrc := print "images/" (.Param "cardImage") ".jpg" }} +{{ $mainimg := resources.Get $imgsrc }} +{{ $cardImageDescription := .Param "cardImageDescription" }} +{{ $croppedImage := $mainimg.Fill "6000x2000 center" }} + + + +
+

{{ default .Title (safeHTML (.Param "motto")) }}

- {{ $imgsrc := print "images/" (.Param "cardImage") ".jpg" }} - {{ $mainimg := resources.Get $imgsrc }} -
-
+
-- 2.45.2 From 8bab0de73845e9ff505c225ae4c110df5ba9a0f8 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:46:24 -0600 Subject: [PATCH 08/41] feat: Add CSS-only scrolling image background --- assets/styles/millironx.css | 73 +++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index cd9d974..3275b67 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -254,3 +254,76 @@ blockquote small { max-width: 50%; } } /* end @media */ + +@supports (animation-timeline: scroll()) { + @keyframes sticky-header { + from { + height: 50vh; + top: 6rem; + } + + to { + height: 10vh; + top: -1rem; + } + } + + @keyframes blurry-header { + from { + filter: blur(0); + } + + to { + filter: blur(2px); + } + } + + @keyframes transparent-text-bg { + from { + background-color: rgba(0.33, 0.33, 0.33, 0.33); + } + to { + background-color: rgba(0.33, 0.33, 0.33, 0); + } + } + + main { + position: relative; + top: 55vh; + } + + .motto { + position: fixed; + top: 12rem; + + animation: sticky-header linear forwards; + animation-timeline: scroll(); + animation-range: 0.001vh 50vh; + } + + .motto::before { + filter: blur(12px); + + top: 2rem; + + animation: blurry-header linear forwards; + animation-timeline: scroll(); + animation-range: 0.001vh 50vh; + } + + .motto-inside h1 { + animation: transparent-text-bg linear forwards; + animation-timeline: scroll(); + animation-range: 0.001vh 40vh; + } + + @media (min-width: 768px) { + .motto { + width: calc(100% - 8rem); + } + + .motto::before { + top: 0; + } + } +} /* end @supports */ -- 2.45.2 From 591420c78ca851d4fd9fe5155d943f5e0af3f978 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:47:54 -0600 Subject: [PATCH 09/41] feat: Add card image descriptions --- content/_index.html | 1 + content/academia/_index.md | 4 +++- content/contact/_index.html | 3 +++ content/videos/_index.md | 3 +++ content/websites/_index.md | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/content/_index.html b/content/_index.html index b33d6af..71758fd 100644 --- a/content/_index.html +++ b/content/_index.html @@ -1,6 +1,7 @@ --- title: Home cardImage: charolette +cardImageDescription: She almost looks like she's in her native country again. motto: My name is Thomas Christensen
I am Milliron X description: The homepage of Thomas A. Christensen II layout: _default/list diff --git a/content/academia/_index.md b/content/academia/_index.md index 6eb6f79..9a9ea19 100644 --- a/content/academia/_index.md +++ b/content/academia/_index.md @@ -2,7 +2,9 @@ title: Academic Publications and Presentations motto: Publications and Presentations cardImage: library -decription: A list of my academic publications +cardImageDescription: + Personally, I preferred the Owen Library in Pullman seven miles west +description: A list of my academic publications menu: main: name: Academia diff --git a/content/contact/_index.html b/content/contact/_index.html index bed691c..0f641c2 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -1,6 +1,9 @@ --- title: Contact Me cardImage: venice-mailbox +cardImageDescription: + This mailbox was used for reporting public health offenses in Venice. It + survived the wrath of Napoleon because it didn't look enough like a lion. motto: Contact Me description: Contact form to get ahold of me date: 2023-07-01 diff --git a/content/videos/_index.md b/content/videos/_index.md index e555640..7b319e4 100644 --- a/content/videos/_index.md +++ b/content/videos/_index.md @@ -1,6 +1,9 @@ --- title: Videos cardImage: camera +cardImageDescription: + Isn't it a shame that the company that brought photography to the masses is + basically out of business now? motto: Videography Portfolio description: Showcase of my own videos menu: diff --git a/content/websites/_index.md b/content/websites/_index.md index 829b010..4238346 100644 --- a/content/websites/_index.md +++ b/content/websites/_index.md @@ -1,6 +1,8 @@ --- title: My Websites cardImage: eclipse +cardImageDescription: + Did you know that the population of Wyoming quadrupled for one day in 2017? motto: Websites description: List of websites that I have worked on menu: -- 2.45.2 From bc5f45da94276d589439dd63fd6a134a6a3fbbc1 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:48:30 -0600 Subject: [PATCH 10/41] feat!: Remove AI page --- content/ai/_index.html | 76 ------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 content/ai/_index.html diff --git a/content/ai/_index.html b/content/ai/_index.html deleted file mode 100644 index 3c6b51a..0000000 --- a/content/ai/_index.html +++ /dev/null @@ -1,76 +0,0 @@ ---- -title: Artificial Insemination -cardImage: Ai-calf -motto: Artificial Insemination -description: - Advertising page to try and sell my artificial insemination services -date: 2022-12-31 -menu: - main: - params: - prefix: fax - icon: fa-bull-sperm - weight: 30 -fa-thumbnail: fax fa-bull-sperm ---- - -
-

Cattle artificial insemination services

- -

- I am licensed in the Great State of Wyoming as a food animal artificial - insemination technician. I only offer AI services for cows, even though - legally I could AI cows, goats, and sheep. My services are most - readily available in the southeast Wyoming area or the Flint Hills of Kansas - depending on the time of year. -

- -

Rate schedule

- -
- - - - - - - - - - - - - - - -
Insemination(per cow) - $25.00 - 5 cow minimum charge
Milage(per mile, one-way) - $1.05 - 2.5 mile minimum charge
-
- -

- I will provide all equipment except semen storage (liquid - nitrogen tank) and cattle handling (i.e., squeeze chute). -

-

- To get started, contact me, and select the "I'm - hiring for artificial insemination" option. -

-
-- 2.45.2 From 89523e50c897f71b5d5b5561173ffbce04a8e9df Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:49:11 -0600 Subject: [PATCH 11/41] feat!: Remove Masonry JS --- layouts/_default/baseof.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index ce29c51..95d9f65 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -102,10 +102,6 @@ {{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" }} - - {{ $masonryjs := resources.Get "scripts/masonry/masonry.pkgd.min.js" }} - - - - - {{ $popperjs := resources.Get "scripts/popper/popper.min.js" }} - {{ $twbsjs := resources.Get "scripts/bootstrap/bootstrap.min.js" }} - {{ $ttjs := resources.Get "scripts/tooltip-enable.js" | minify }} - {{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" }} - - - - {{ partial "extras-modal" . }} -- 2.45.2 From f914883951131e47e9b68a4e74e76f3cbab6b5df Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:29:58 -0700 Subject: [PATCH 23/41] feat: Add FontAwesome icons to assets --- assets/graphics/fa/book.svg | 1 + assets/graphics/fa/browser.svg | 1 + assets/graphics/fa/comment.svg | 1 + assets/graphics/fa/cowbell.svg | 1 + assets/graphics/fa/ellipsis.svg | 1 + assets/graphics/fa/file-alt.svg | 1 + assets/graphics/fa/file-signature.svg | 1 + assets/graphics/fa/github.svg | 1 + assets/graphics/fa/gitlab.svg | 1 + assets/graphics/fa/globe.svg | 1 + assets/graphics/fa/graduation-cap.svg | 1 + assets/graphics/fa/home.svg | 1 + assets/graphics/fa/house.svg | 1 + assets/graphics/fa/notebook.svg | 1 + assets/graphics/fa/orcid.svg | 1 + assets/graphics/fa/podium.svg | 1 + assets/graphics/fa/presentation.svg | 1 + assets/graphics/fa/scale-balanced.svg | 1 + assets/graphics/fa/stack-overflow.svg | 1 + assets/graphics/fa/steam.svg | 1 + assets/graphics/fa/tag.svg | 1 + assets/graphics/fa/university.svg | 1 + assets/graphics/fa/user-astronaut.svg | 1 + assets/graphics/fa/user.svg | 1 + assets/graphics/fa/video.svg | 1 + assets/graphics/fa/vimeo.svg | 1 + assets/graphics/fa/w.svg | 1 + 27 files changed, 27 insertions(+) create mode 100644 assets/graphics/fa/book.svg create mode 100644 assets/graphics/fa/browser.svg create mode 100644 assets/graphics/fa/comment.svg create mode 100644 assets/graphics/fa/cowbell.svg create mode 100644 assets/graphics/fa/ellipsis.svg create mode 100644 assets/graphics/fa/file-alt.svg create mode 100644 assets/graphics/fa/file-signature.svg create mode 100644 assets/graphics/fa/github.svg create mode 100644 assets/graphics/fa/gitlab.svg create mode 100644 assets/graphics/fa/globe.svg create mode 100644 assets/graphics/fa/graduation-cap.svg create mode 100644 assets/graphics/fa/home.svg create mode 100644 assets/graphics/fa/house.svg create mode 100644 assets/graphics/fa/notebook.svg create mode 100644 assets/graphics/fa/orcid.svg create mode 100644 assets/graphics/fa/podium.svg create mode 100644 assets/graphics/fa/presentation.svg create mode 100644 assets/graphics/fa/scale-balanced.svg create mode 100644 assets/graphics/fa/stack-overflow.svg create mode 100644 assets/graphics/fa/steam.svg create mode 100644 assets/graphics/fa/tag.svg create mode 100644 assets/graphics/fa/university.svg create mode 100644 assets/graphics/fa/user-astronaut.svg create mode 100644 assets/graphics/fa/user.svg create mode 100644 assets/graphics/fa/video.svg create mode 100644 assets/graphics/fa/vimeo.svg create mode 100644 assets/graphics/fa/w.svg diff --git a/assets/graphics/fa/book.svg b/assets/graphics/fa/book.svg new file mode 100644 index 0000000..a4957d9 --- /dev/null +++ b/assets/graphics/fa/book.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/browser.svg b/assets/graphics/fa/browser.svg new file mode 100644 index 0000000..fe78601 --- /dev/null +++ b/assets/graphics/fa/browser.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/comment.svg b/assets/graphics/fa/comment.svg new file mode 100644 index 0000000..a113bb1 --- /dev/null +++ b/assets/graphics/fa/comment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/cowbell.svg b/assets/graphics/fa/cowbell.svg new file mode 100644 index 0000000..6b176d6 --- /dev/null +++ b/assets/graphics/fa/cowbell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/ellipsis.svg b/assets/graphics/fa/ellipsis.svg new file mode 100644 index 0000000..454acdc --- /dev/null +++ b/assets/graphics/fa/ellipsis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/file-alt.svg b/assets/graphics/fa/file-alt.svg new file mode 100644 index 0000000..cbeb1cd --- /dev/null +++ b/assets/graphics/fa/file-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/file-signature.svg b/assets/graphics/fa/file-signature.svg new file mode 100644 index 0000000..393f01d --- /dev/null +++ b/assets/graphics/fa/file-signature.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/github.svg b/assets/graphics/fa/github.svg new file mode 100644 index 0000000..af1538f --- /dev/null +++ b/assets/graphics/fa/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/gitlab.svg b/assets/graphics/fa/gitlab.svg new file mode 100644 index 0000000..53448bd --- /dev/null +++ b/assets/graphics/fa/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/globe.svg b/assets/graphics/fa/globe.svg new file mode 100644 index 0000000..7f6ac96 --- /dev/null +++ b/assets/graphics/fa/globe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/graduation-cap.svg b/assets/graphics/fa/graduation-cap.svg new file mode 100644 index 0000000..c8cf5f7 --- /dev/null +++ b/assets/graphics/fa/graduation-cap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/home.svg b/assets/graphics/fa/home.svg new file mode 100644 index 0000000..4375a16 --- /dev/null +++ b/assets/graphics/fa/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/house.svg b/assets/graphics/fa/house.svg new file mode 100644 index 0000000..4375a16 --- /dev/null +++ b/assets/graphics/fa/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/notebook.svg b/assets/graphics/fa/notebook.svg new file mode 100644 index 0000000..e8c472d --- /dev/null +++ b/assets/graphics/fa/notebook.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/orcid.svg b/assets/graphics/fa/orcid.svg new file mode 100644 index 0000000..59d1496 --- /dev/null +++ b/assets/graphics/fa/orcid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/podium.svg b/assets/graphics/fa/podium.svg new file mode 100644 index 0000000..651ac61 --- /dev/null +++ b/assets/graphics/fa/podium.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/presentation.svg b/assets/graphics/fa/presentation.svg new file mode 100644 index 0000000..f0e782f --- /dev/null +++ b/assets/graphics/fa/presentation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/scale-balanced.svg b/assets/graphics/fa/scale-balanced.svg new file mode 100644 index 0000000..3423b7f --- /dev/null +++ b/assets/graphics/fa/scale-balanced.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/stack-overflow.svg b/assets/graphics/fa/stack-overflow.svg new file mode 100644 index 0000000..8fe3d70 --- /dev/null +++ b/assets/graphics/fa/stack-overflow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/steam.svg b/assets/graphics/fa/steam.svg new file mode 100644 index 0000000..ff6db89 --- /dev/null +++ b/assets/graphics/fa/steam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/tag.svg b/assets/graphics/fa/tag.svg new file mode 100644 index 0000000..ef06d64 --- /dev/null +++ b/assets/graphics/fa/tag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/university.svg b/assets/graphics/fa/university.svg new file mode 100644 index 0000000..a99a14e --- /dev/null +++ b/assets/graphics/fa/university.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/user-astronaut.svg b/assets/graphics/fa/user-astronaut.svg new file mode 100644 index 0000000..2f6d921 --- /dev/null +++ b/assets/graphics/fa/user-astronaut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/user.svg b/assets/graphics/fa/user.svg new file mode 100644 index 0000000..8b31931 --- /dev/null +++ b/assets/graphics/fa/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/video.svg b/assets/graphics/fa/video.svg new file mode 100644 index 0000000..c4052b1 --- /dev/null +++ b/assets/graphics/fa/video.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/vimeo.svg b/assets/graphics/fa/vimeo.svg new file mode 100644 index 0000000..ee03fa1 --- /dev/null +++ b/assets/graphics/fa/vimeo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/graphics/fa/w.svg b/assets/graphics/fa/w.svg new file mode 100644 index 0000000..59396f5 --- /dev/null +++ b/assets/graphics/fa/w.svg @@ -0,0 +1 @@ + \ No newline at end of file -- 2.45.2 From 27b1a25a5326ab677eb47561306a41f4885c9f15 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:30:55 -0700 Subject: [PATCH 24/41] refactor: Use FontAwesome icon files embedded instead of script replacement --- content/_index.md | 12 ++++++------ layouts/shortcodes/fa.html | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/content/_index.md b/content/_index.md index a8544d1..d815a21 100644 --- a/content/_index.md +++ b/content/_index.md @@ -63,15 +63,15 @@ stories. Around the web you can find me at (in order of subjective importance) -- {{< fa fab github yes >}} GitHub: [@MillironX](https://github.com/MillironX) -- {{< fa fab orcid yes >}} ORDiD: +- {{< fa github yes >}} GitHub: [@MillironX](https://github.com/MillironX) +- {{< fa orcid yes >}} ORDiD: [0000-0003-1219-9320](https://orcid.org/0000-0003-1219-9320) -- {{< fa fab gitlab yes >}} GitLab: [@MillironX](https://gitlab.com/MillironX) -- {{< fa fab vimeo yes >}} Vimeo: +- {{< fa gitlab yes >}} GitLab: [@MillironX](https://gitlab.com/MillironX) +- {{< fa vimeo yes >}} Vimeo: [Thomas Christensen II](https://vimeo.com/tchristensenii) -- {{< fa fab stack-overflow yes >}} StackExchange: +- {{< fa stack-overflow yes >}} StackExchange: [Milliron X](https://stackexchange.com/users/4863541/milliron-x) -- {{< fa fab steam yes >}} Steam: +- {{< fa steam yes >}} Steam: [MillironX](https://steamcommunity.com/id/millironx) This list is intended to verify my identity on other sites. Please do _not_ use diff --git a/layouts/shortcodes/fa.html b/layouts/shortcodes/fa.html index c6d265f..73663c8 100644 --- a/layouts/shortcodes/fa.html +++ b/layouts/shortcodes/fa.html @@ -1,11 +1,13 @@ -{{- $faStyle := .Get 0 -}} -{{- $faName := .Get 1 -}} -{{- $isFullWidth := .Get 2 -}} - +> + {{- readFile $fontAwesomePath | safeHTML -}} + -- 2.45.2 From 85ec5eebbc8510670873050561a09a2eb3ba2d7c Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:31:28 -0700 Subject: [PATCH 25/41] feat: Add styles to make FontAwesome icons appear correctly when embedded --- assets/styles/millironx.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 136e6c6..2940615 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -252,6 +252,22 @@ footer { color: white; } +.fa-container svg { + overflow: visible; + box-sizing: content-box; + display: inline-block; + height: 1em; + vertical-align: -0.125em; +} + +.fa-container.fa-fw svg { + width: 1.25em; +} + +.fa-container svg path { + fill: currentColor; +} + /* Helper classes */ -- 2.45.2 From 86c1bf1ed42845fbde41e53ddec7a42ca434b62a Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:40:53 -0700 Subject: [PATCH 26/41] refactor: Replace all instaces of FontAwesome scripted icons with embedded svg --- content/_index.md | 3 +-- content/academia/_index.md | 5 ++--- content/contact/_index.html | 5 ++--- content/videos/_index.md | 5 ++--- content/websites/_index.md | 5 ++--- layouts/_default/list.html | 5 ++++- layouts/partials/sidebar.html | 8 +++++++- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/content/_index.md b/content/_index.md index d815a21..4710eb4 100644 --- a/content/_index.md +++ b/content/_index.md @@ -8,8 +8,7 @@ layout: _default/list menu: main: params: - prefix: fad - icon: fa-home + icon: home weight: -1000 --- diff --git a/content/academia/_index.md b/content/academia/_index.md index 9a9ea19..10e4083 100644 --- a/content/academia/_index.md +++ b/content/academia/_index.md @@ -9,10 +9,9 @@ menu: main: name: Academia params: - prefix: fad - icon: fa-university + icon: university weight: 20 -fa-thumbnail: fad fa-university +fa-thumbnail: university --- > I have spent too long in school and not enough time in the middle of nowhere diff --git a/content/contact/_index.html b/content/contact/_index.html index 0f641c2..840ade4 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -11,10 +11,9 @@ menu: main: name: Contact params: - prefix: fad - icon: fa-file-signature + icon: file-signature weight: 1 -fa-thumbnail: fad fa-file-signature +fa-thumbnail: file-signature ---
### The culmination of all art forms is that of film. diff --git a/content/websites/_index.md b/content/websites/_index.md index 4238346..df065e8 100644 --- a/content/websites/_index.md +++ b/content/websites/_index.md @@ -9,9 +9,8 @@ menu: main: name: Websites params: - prefix: fad - icon: fa-browser -fa-thumbnail: fad fa-browser + icon: browser +fa-thumbnail: browser --- I do occasionally build websites for myself and other people. Here is a list of diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 9168fd5..8f63516 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -15,7 +15,10 @@
- + {{- $fontAwesomePath := print "assets/graphics/fa/" . ".svg" -}} + + {{- readFile $fontAwesomePath | safeHTML -}} +
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index c5e6473..a9e2049 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -7,7 +7,13 @@ class="{{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}" href="{{ .URL }}" > - + {{- $fontAwesomePath := print "assets/graphics/fa/" .Params.icon ".svg" -}} + + {{- readFile $fontAwesomePath | safeHTML -}} + {{ .Name }} {{ end }} -- 2.45.2 From 2d8f6248100de6c59ef1aede9ff28a9c48d83a82 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:52:37 -0700 Subject: [PATCH 27/41] fix: Chrome scrolling support selector --- assets/styles/millironx.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 2940615..5af638d 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -387,7 +387,7 @@ footer { } } /* end @media */ -@supports (animation-timeline: scroll()) and (animation-range) { +@supports (animation-timeline: scroll()) and (animation-range: 0 50vh) { @keyframes sticky-header { from { height: 50vh; -- 2.45.2 From eea76753a46c07e3ea8f2a7e5fb92db905a92d4e Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:53:46 -0700 Subject: [PATCH 28/41] fix: Footer position on Chrome --- assets/styles/millironx.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 5af638d..231b323 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -419,7 +419,8 @@ footer { } } - main { + main, + footer { position: relative; top: 55vh; } -- 2.45.2 From 838d9a202800794be45d57ff7ee86b97b6bd1840 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:15:59 -0700 Subject: [PATCH 29/41] feat: Remove modal partial template --- layouts/partials/extras-modal.html | 247 ----------------------------- 1 file changed, 247 deletions(-) delete mode 100644 layouts/partials/extras-modal.html diff --git a/layouts/partials/extras-modal.html b/layouts/partials/extras-modal.html deleted file mode 100644 index ebea7e3..0000000 --- a/layouts/partials/extras-modal.html +++ /dev/null @@ -1,247 +0,0 @@ - -- 2.45.2 From 7007c1e878cf195deedc2ff0ce1fb2e61bd1bd33 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:17:50 -0700 Subject: [PATCH 30/41] feat: Remove academia partial template --- layouts/partials/academia/list-single.html | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 layouts/partials/academia/list-single.html diff --git a/layouts/partials/academia/list-single.html b/layouts/partials/academia/list-single.html deleted file mode 100644 index bfc6c0b..0000000 --- a/layouts/partials/academia/list-single.html +++ /dev/null @@ -1,74 +0,0 @@ -
-
- {{ if eq .Params.medium "paper" }} - {{ .Scratch.Set "fa" "fa-book" }} - {{ else if eq .Params.medium "poster" }} - {{ .Scratch.Set "fa" "fa-presentation" }} - {{ else if eq .Params.medium "thesis" }} - {{ .Scratch.Set "fa" "fa-graduation-cap" }} - {{ else if eq .Params.medium "presentation" }} - {{ .Scratch.Set "fa" "fa-podium" }} - {{ else }} - {{ .Scratch.Set "fa" "fa-notebook" }} - {{ end }} - - {{ $fa := (.Scratch.Get "fa") }} - - -

- -

- {{ with .Params.link }} - - {{ end }} -
-
-

- - {{ .Title }} - -

- {{ $authlist := .Params.authors }} - {{ range $idx, $auth := .Params.authors }} - {{ if and (eq $idx (sub (len $authlist) 1)) (gt 1 (len $authlist)) }} - and - {{ end }} - {{- if eq $auth "Thomas A. Christensen II" }} - {{ $auth }} - {{- else }} - {{ $auth }} - {{- end }} - {{- if lt $idx (sub (len $authlist) 1) -}} - , - {{- end }} - {{ end }} -
- {{ .Params.journal }}: - {{ .Params.location }} - ({{ dateFormat "02 Jan 2006" .Params.date }}) -
- {{ with .Params.keywords }} - Keywords: - {{ range . }} - {{ . }} - {{ end }} -
- {{ end }} - {{ if eq (.Scratch.Get "showAbstract") true }} -
- Abstract - {{ .Content }} -
- {{ end }} -
-
-- 2.45.2 From 478a7f8af7913353e872001314d92cd840064992 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:27:05 -0700 Subject: [PATCH 31/41] fix: Odd formatting on Academia single template --- assets/styles/millironx.css | 7 ++++++ layouts/academia/single.html | 48 ++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 231b323..25a0fc4 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -370,6 +370,13 @@ footer { margin-left: 1rem; } + .bolder { + font-weight: bolder; + background-color: rgba(0, 0, 0, 0.33); + border-radius: 0.25em; + padding: 0.25em 0.75em 0.5em 0.33em; + } + /* Clearfix implementation */ diff --git a/layouts/academia/single.html b/layouts/academia/single.html index 9466a74..ac7fad7 100644 --- a/layouts/academia/single.html +++ b/layouts/academia/single.html @@ -1,27 +1,27 @@ {{ define "main" }} -
-
-
- {{ .Params.journal }}{{ with .Params.location }}: {{ . }}{{ end }} -
-

{{ .Title }}

-

- -
    - {{ range .Params.authors }} -
  • {{ . }}
  • - {{ end }} -
-
-

-

{{ .Date | time.Format "January 2, 2006" }}

- {{ .Content }} - {{ with .Params.link }} -
- {{ . }} - -
- {{ end }} -
+
+
+ {{ .Params.journal }}{{ with .Params.location }}: {{ . }}{{ end }} +
+

{{ .Title }}

+

+ + {{ range (.GetTerms "people") }} + {{- partial "fa.html" "user" }} {{ .LinkTitle }} + {{ end }} + +

+

{{ .Date | time.Format "January 2, 2006" }}

+ {{ .Content }} + {{ with .Params.link }} + {{ . }} + + {{ end }}
{{ end }} -- 2.45.2 From e7972cfd81ba52cddd535a90211f486c5e1a450a Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:33:39 -0700 Subject: [PATCH 32/41] refactor: Change FontAwesome icon embed to partial template --- assets/styles/millironx.css | 5 +---- content/_index.md | 13 ++++++------- layouts/_default/list.html | 11 ++++------- layouts/partials/category-button.html | 14 +++++++------- layouts/partials/fa.html | 4 ++++ layouts/partials/sidebar.html | 8 +------- layouts/shortcodes/fa.html | 13 +------------ 7 files changed, 24 insertions(+), 44 deletions(-) create mode 100644 layouts/partials/fa.html diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 25a0fc4..1e620de 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -257,11 +257,8 @@ footer { box-sizing: content-box; display: inline-block; height: 1em; - vertical-align: -0.125em; -} - -.fa-container.fa-fw svg { width: 1.25em; + vertical-align: -0.125em; } .fa-container svg path { diff --git a/content/_index.md b/content/_index.md index 4710eb4..b7cd16c 100644 --- a/content/_index.md +++ b/content/_index.md @@ -62,16 +62,15 @@ stories. Around the web you can find me at (in order of subjective importance) -- {{< fa github yes >}} GitHub: [@MillironX](https://github.com/MillironX) -- {{< fa orcid yes >}} ORDiD: +- {{< fa github >}} GitHub: [@MillironX](https://github.com/MillironX) +- {{< fa orcid >}} ORDiD: [0000-0003-1219-9320](https://orcid.org/0000-0003-1219-9320) -- {{< fa gitlab yes >}} GitLab: [@MillironX](https://gitlab.com/MillironX) -- {{< fa vimeo yes >}} Vimeo: +- {{< fa gitlab >}} GitLab: [@MillironX](https://gitlab.com/MillironX) +- {{< fa vimeo >}} Vimeo: [Thomas Christensen II](https://vimeo.com/tchristensenii) -- {{< fa stack-overflow yes >}} StackExchange: +- {{< fa stack-overflow >}} StackExchange: [Milliron X](https://stackexchange.com/users/4863541/milliron-x) -- {{< fa steam yes >}} Steam: - [MillironX](https://steamcommunity.com/id/millironx) +- {{< fa steam >}} Steam: [MillironX](https://steamcommunity.com/id/millironx) This list is intended to verify my identity on other sites. Please do _not_ use it as fodder to try and "follow" me on each of these platforms. I stand with diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 8f63516..8c79f98 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -15,10 +15,7 @@
- {{- $fontAwesomePath := print "assets/graphics/fa/" . ".svg" -}} - - {{- readFile $fontAwesomePath | safeHTML -}} - + {{- partial "fa.html" . -}}
@@ -63,9 +60,9 @@ {{ .LinkTitle }}{{- partial "fa.html" "user" }} {{ .LinkTitle }} {{ end }} @@ -82,7 +79,7 @@ diff --git a/layouts/partials/category-button.html b/layouts/partials/category-button.html index b54d5ba..5b5d7e7 100644 --- a/layouts/partials/category-button.html +++ b/layouts/partials/category-button.html @@ -3,12 +3,12 @@ {{ if eq $i 0 }} {{ with $.Site.GetPage (printf "/%s/%s" "categories" $category) }} {{ $iconDictionary := dict - "video" "fad fa-video" - "paper" "fad fa-book" - "poster" "fad fa-presentation" - "thesis" "fad fa-graduation-cap" - "presentation" "fad fa-podium" - "web" "fad fa-globe" + "video" "video" + "paper" "book" + "poster" "presentation" + "thesis" "graduation-cap" + "presentation" "podium" + "web" "globe" }} {{ $categoryIcon := index $iconDictionary $category }} - + {{- partial "fa.html" $categoryIcon -}} {{ end }} {{ end }} diff --git a/layouts/partials/fa.html b/layouts/partials/fa.html new file mode 100644 index 0000000..540a166 --- /dev/null +++ b/layouts/partials/fa.html @@ -0,0 +1,4 @@ +{{- $fontAwesomePath := print "assets/graphics/fa/" . ".svg" -}} + + {{- readFile $fontAwesomePath | safeHTML -}} + diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index a9e2049..483f7f8 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -7,13 +7,7 @@ class="{{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}" href="{{ .URL }}" > - {{- $fontAwesomePath := print "assets/graphics/fa/" .Params.icon ".svg" -}} - - {{- readFile $fontAwesomePath | safeHTML -}} - + {{- partial "fa.html" .Params.icon -}} {{ .Name }} {{ end }} diff --git a/layouts/shortcodes/fa.html b/layouts/shortcodes/fa.html index 73663c8..454b184 100644 --- a/layouts/shortcodes/fa.html +++ b/layouts/shortcodes/fa.html @@ -1,13 +1,2 @@ {{- $faName := .Get 0 -}} -{{- $isFullWidth := .Get 1 -}} - -{{- $fontAwesomePath := print "assets/graphics/fa/" $faName ".svg" -}} - - - - {{- readFile $fontAwesomePath | safeHTML -}} - +{{- partial "fa.html" $faName -}} -- 2.45.2 From 8ec7300c3e4648c8e3f8d5c25f2fd3ae9501c1d8 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 18:34:43 -0700 Subject: [PATCH 33/41] feat: Remove FontAwesome script file --- layouts/_default/baseof.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 601c014..2461ed6 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -48,10 +48,6 @@

- - {{ $fontawesome := resources.Get "scripts/fa-icons.js" | js.Build "js/fontawesome.js" | minify }} - - {{ $jquery := resources.Get "scripts/jquery/jquery.min.js" }} {{ $jqmaskjs := resources.Get "scripts/jquery-mask-plugin/jquery.mask.min.js" }} -- 2.45.2 From e8fbe1813b48dc2a0356b4ed6d9c4e54d599ba06 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 19:14:49 -0700 Subject: [PATCH 34/41] refactor: Move JQuery masking plugins to their own partial template --- content/contact/_index.html | 1 + layouts/_default/baseof.html | 11 +++++------ layouts/partials/form-validation.html | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 layouts/partials/form-validation.html diff --git a/content/contact/_index.html b/content/contact/_index.html index 840ade4..5c1ca50 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -14,6 +14,7 @@ menu: icon: file-signature weight: 1 fa-thumbnail: file-signature +validation: true --- - - {{ $jquery := resources.Get "scripts/jquery/jquery.min.js" }} - {{ $jqmaskjs := resources.Get "scripts/jquery-mask-plugin/jquery.mask.min.js" }} - {{ $maskjs := resources.Get "scripts/phone-masking.js" | minify }} - {{ $jquerybundle := slice $jquery $jqmaskjs $maskjs | resources.Concat "js/jquery-bundle.js" }} - + {{ with .Params.validation }} + {{- partial "form-validation.html" -}} + {{ end }} + + -- 2.45.2 From 64fc0d2d4db1d4296a56d867ecde587571679020 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 19:30:57 -0700 Subject: [PATCH 35/41] refactor: Make form page conform to new styles --- assets/styles/millironx.css | 26 +++++++ content/contact/_index.html | 135 +++++++++++++----------------------- 2 files changed, 75 insertions(+), 86 deletions(-) diff --git a/assets/styles/millironx.css b/assets/styles/millironx.css index 1e620de..fb47932 100644 --- a/assets/styles/millironx.css +++ b/assets/styles/millironx.css @@ -131,6 +131,28 @@ footer { align-items: center; } +form { + margin: 1rem; +} + +fieldset { + padding: 1rem; +} + +input, +select, +textarea { + width: 100%; + margin-bottom: 0.5rem; +} + +input:invalid, +select:invalid, +textarea:invalid { + border-bottom-width: 2px; + border-bottom-color: var(--ear-tag-red); +} + /* Container-type helper classes */ @@ -330,6 +352,10 @@ footer { display: none; } + main { + width: calc(100% - 10rem); + } + /* Container-type helper classes */ diff --git a/content/contact/_index.html b/content/contact/_index.html index 5c1ca50..79d864c 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -17,94 +17,57 @@ fa-thumbnail: file-signature validation: true --- - +
Contact Me -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
+ + + + + + + + + + + +
-- 2.45.2 From 9904d5e8c4428592d64b2a2aee26eb9331674b49 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 1 Dec 2024 19:32:01 -0700 Subject: [PATCH 36/41] refactor: Remove unneeded classes from sidebar --- layouts/partials/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 483f7f8..90d26fe 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,6 +1,6 @@ {{ $millironx := resources.Get "graphics/millironx.svg" }} {{ $currentPage := . }} -