diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index b0b38bf..fbae12e 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -2,7 +2,7 @@ name: Build and Deploy Site on: push: branches: - - master + - master jobs: build: runs-on: ubuntu-latest @@ -20,7 +20,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - hugo-version: 'latest' + hugo-version: "latest" extended: true - name: Configure npm run: | diff --git a/assets/scripts/phone-masking.js b/assets/scripts/phone-masking.js index ffda764..1edbd77 100644 --- a/assets/scripts/phone-masking.js +++ b/assets/scripts/phone-masking.js @@ -1 +1 @@ -$('#phone').mask('(000) 000-0000') +$("#phone").mask("(000) 000-0000"); diff --git a/assets/scripts/scroll-effect.js b/assets/scripts/scroll-effect.js index 8beed9e..42a4af8 100644 --- a/assets/scripts/scroll-effect.js +++ b/assets/scripts/scroll-effect.js @@ -1,6 +1,5 @@ $(window).scroll(function (e) { - oVal = ($(window).scrollTop() / 170); - $(".blur").css("opacity", oVal); - + oVal = $(window).scrollTop() / 170; + $(".blur").css("opacity", oVal); }); $("#motto").fitText(); diff --git a/assets/scripts/tooltip-enable.js b/assets/scripts/tooltip-enable.js index e06cea8..7009708 100644 --- a/assets/scripts/tooltip-enable.js +++ b/assets/scripts/tooltip-enable.js @@ -1,4 +1,6 @@ -var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')) +var tooltipTriggerList = [].slice.call( + document.querySelectorAll('[data-bs-toggle="tooltip"]') +); var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) { - return new bootstrap.Tooltip(tooltipTriggerEl) -}) + return new bootstrap.Tooltip(tooltipTriggerEl); +}); diff --git a/assets/styles/main.css b/assets/styles/main.css index 09201a0..c03d751 100644 --- a/assets/styles/main.css +++ b/assets/styles/main.css @@ -1,115 +1,115 @@ .blurred-container { - position: relative; - width: 100%; - min-height: 35vh; - height: 350px; - top: 0; - left: 0; + position: relative; + width: 100%; + min-height: 35vh; + height: 350px; + top: 0; + left: 0; } .blurred-container .motto { - color: #fff; - font-size: 76px; - font-weight: 600; - text-align: center; - text-shadow: 0 0 10px rgba(0, 0, 0, .33); - text-transform: uppercase; - top: 7.5vh; - z-index: 3; - display: block; - margin: 0 auto; - position: relative; - width: 60%; - height: 0 + color: #fff; + font-size: 76px; + font-weight: 600; + text-align: center; + text-shadow: 0 0 10px rgba(0, 0, 0, 0.33); + text-transform: uppercase; + top: 7.5vh; + z-index: 3; + display: block; + margin: 0 auto; + position: relative; + width: 60%; + height: 0; } .motto h1 { - background: #0000007d; + background: #0000007d; } .blurred-container .img-src { - position: fixed; - width: 100%; - min-height: 35vh; - height: 350px; - background-repeat: no-repeat; - background-size: cover; - background-position: center center; + position: fixed; + width: 100%; + min-height: 35vh; + height: 350px; + background-repeat: no-repeat; + background-size: cover; + background-position: center center; } .blur { - opacity: 0; + opacity: 0; } main { - position: relative; - background-color: #fff; + position: relative; + background-color: #fff; } /* Gives me greater control over fonts */ .font-serif { - font-family: Georgia, "Times New Roman", Times, serif; + font-family: Georgia, "Times New Roman", Times, serif; } .font-sans { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } .font-mono { - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; } .font-small-caps { - font-variant-caps: small-caps; + font-variant-caps: small-caps; } .strikethrough { - text-decoration: line-through; + text-decoration: line-through; } .sfTable { - margin: 0 auto; + margin: 0 auto; } .text-align-left { - text-align: left + text-align: left; } .text-align-right { - text-align: right; + text-align: right; } .float-left { - float: left; + float: left; } .float-right { - float: right; + float: right; } .media-object { - max-height: 100%; - max-width: 100%; + max-height: 100%; + max-width: 100%; } @media (min-width: 768px) { - .pull-left { - max-width: 25%; - } + .pull-left { + max-width: 25%; + } } h1 small { - font-size: 60%; - color: #9a9a9a; - font-weight: 300; - line-height: 1.5; + font-size: 60%; + color: #9a9a9a; + font-weight: 300; + line-height: 1.5; } h1 { - font-weight: 400; - margin: 30px 0 15px; + font-weight: 400; + margin: 30px 0 15px; } .dogear { - clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 25%, 75% 0); + clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 25%, 75% 0); } diff --git a/content/academia/_index.md b/content/academia/_index.md index ced6d26..369bfee 100644 --- a/content/academia/_index.md +++ b/content/academia/_index.md @@ -3,4 +3,5 @@ title: Academic Publications and Presentations motto: Academic Publications and Presentations cardImage: library --- + ### Academic Papers diff --git a/content/academia/cheme-car.md b/content/academia/cheme-car.md index 43402eb..1902df7 100644 --- a/content/academia/cheme-car.md +++ b/content/academia/cheme-car.md @@ -13,7 +13,7 @@ keywords: type: thesis authors: - Thomas A. Christensen II -link: 'https://hdl.handle.net/20.500.11919/3817' +link: "https://hdl.handle.net/20.500.11919/3817" journal: "University of Wyoming Honors Program" location: "Laramie, Wyoming" --- diff --git a/content/academia/how-to-build-a-cow-cud-fuel-cell.md b/content/academia/how-to-build-a-cow-cud-fuel-cell.md index e3c3e13..10c63a5 100644 --- a/content/academia/how-to-build-a-cow-cud-fuel-cell.md +++ b/content/academia/how-to-build-a-cow-cud-fuel-cell.md @@ -10,5 +10,5 @@ authors: journal: "Idaho INBRE Summer Research Conference" location: "Moscow, Idaho" awards: - - '3rd Place Fast-Pitch Science Presentation Contest' + - "3rd Place Fast-Pitch Science Presentation Contest" --- diff --git a/content/academia/metagenomics/index.md b/content/academia/metagenomics/index.md index aa40eb8..5d20862 100644 --- a/content/academia/metagenomics/index.md +++ b/content/academia/metagenomics/index.md @@ -15,11 +15,11 @@ authors: - Kathy J. Austin - Kristi M. Cammack - Hannah C. Cunningham-Hollinger -link: '/academia/metagenomics/metagenomics_analysis_of_rumen_populations.pdf' +link: "/academia/metagenomics/metagenomics_analysis_of_rumen_populations.pdf" journal: "Westion Section American Society of Animal Science Annual Meeting" location: "Boise, Idaho" awards: - - '1st Place Undergraduate Poster Competition' + - "1st Place Undergraduate Poster Competition" --- Early colonization of the rumen microbiome is critical to host health and long diff --git a/content/academia/pva-aiche/index.md b/content/academia/pva-aiche/index.md index a017ec0..61fe4ad 100644 --- a/content/academia/pva-aiche/index.md +++ b/content/academia/pva-aiche/index.md @@ -21,7 +21,7 @@ authors: journal: "AIChE Annual Meeting" location: "Pittsburgh, Pennsylvania" awards: - - '3rd Place Environmental III Division Undergraduate Poster Competition' + - "3rd Place Environmental III Division Undergraduate Poster Competition" link: /academia/pva-aiche/measuring_diffusion_of_trichloroethylene.pdf --- diff --git a/content/academia/thesis.md b/content/academia/thesis.md index cb21f2e..28c11f0 100644 --- a/content/academia/thesis.md +++ b/content/academia/thesis.md @@ -13,7 +13,7 @@ keywords: type: thesis authors: - Thomas A. Christensen II -link: 'https://www.proquest.com/dissertations-theses/polyoxometalate-incorporation-effects-on-proton/docview/2502214356/se-2' +link: "https://www.proquest.com/dissertations-theses/polyoxometalate-incorporation-effects-on-proton/docview/2502214356/se-2" journal: "University of Idaho" location: "Moscow, Idaho" --- diff --git a/content/contact/_index.html b/content/contact/_index.html index 6f7a680..ea2beec 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -4,47 +4,85 @@ cardImage: venice-mailbox motto: Contact Me --- -
-
- Contact Me - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
+ +
+ Contact Me + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8a87b7c..fef4eee 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,129 +1,173 @@ - - - - - - - - {{ .Title }} - {{ .Site.Title }} - - {{ $twbscss := resources.Get "node_modules/bootstrap/scss/bootstrap.scss" | resources.ToCSS }} - {{ $mycss := resources.Get "styles/main.css" }} - {{ $allcss := slice $twbscss $mycss | resources.Concat "css/bundle.css" }} - {{ $allcsspure := $allcss | resources.PostCSS (dict "nomap" true) | minify | fingerprint | resources.PostProcess }} - - - -{{ $millironx := resources.Get "graphics/millironx.svg" }} - - -
-
- -
-
-
-

- Milliron X -   - Milliron X -

-
-
-
-
-

- {{ safeHTML (.Param "motto") }} -

-
- {{ $imgsrc := print "images/" (.Param "cardImage") ".jpg" }} - {{ $mainimg := resources.Get $imgsrc }} - {{ $blurimg := $mainimg.Filter (images.GaussianBlur 100) }} -
-
-
-
-
-
- {{ block "main" . }}{{ end }} -
-
-
-
-
- - {{ $jqueryjs := resources.Get "node_modules/jquery/dist/jquery.js" }} - {{ $popperjs := resources.Get "node_modules/@popperjs/core/dist/umd/popper.js" }} - {{ $twbsjs := resources.Get "node_modules/bootstrap/dist/js/bootstrap.js" }} - {{ $fajs := resources.Get "node_modules/@fortawesome/fontawesome-pro/js/all.js" }} - {{ $fittextjs := resources.Get "node_modules/fittext.js/jquery.fittext.js" }} - {{ $jqmaskjs := resources.Get "node_modules/jquery-mask-plugin/dist/jquery.mask.js" }} - {{ $scrolljs := resources.Get "scripts/scroll-effect.js" }} - {{ $maskjs := resources.Get "scripts/phone-masking.js" }} - {{ $ttjs := resources.Get "scripts/tooltip-enable.js" }} - {{ $alljs := slice $jqueryjs $popperjs $twbsjs $fajs $fittextjs $scrolljs $jqmaskjs $maskjs $ttjs | resources.Concat - "js/bundle.js" | minify | fingerprint }} - - - - + + + + + + + {{ .Title }} - {{ .Site.Title }} + + {{ $twbscss := resources.Get "node_modules/bootstrap/scss/bootstrap.scss" | resources.ToCSS }} + {{ $mycss := resources.Get "styles/main.css" }} + {{ $allcss := slice $twbscss $mycss | resources.Concat "css/bundle.css" }} + {{ $allcsspure := $allcss | resources.PostCSS (dict "nomap" true) | minify | fingerprint | resources.PostProcess }} + + + + {{ $millironx := resources.Get "graphics/millironx.svg" }} + + + +
+
+ +
+
+
+

+ + Milliron X + +   Milliron X +

+
+
+
+
+

+ {{ safeHTML (.Param "motto") }} +

+
+ {{ $imgsrc := print "images/" (.Param "cardImage") ".jpg" }} + {{ $mainimg := resources.Get $imgsrc }} + {{ $blurimg := $mainimg.Filter (images.GaussianBlur 100) }} +
+
+
+
+
+
+ {{ block "main" . }}{{ end }} +
+
+
+
+
+ + {{ $jqueryjs := resources.Get "node_modules/jquery/dist/jquery.js" }} + {{ $popperjs := resources.Get "node_modules/@popperjs/core/dist/umd/popper.js" }} + {{ $twbsjs := resources.Get "node_modules/bootstrap/dist/js/bootstrap.js" }} + {{ $fajs := resources.Get "node_modules/@fortawesome/fontawesome-pro/js/all.js" }} + {{ $fittextjs := resources.Get "node_modules/fittext.js/jquery.fittext.js" }} + {{ $jqmaskjs := resources.Get "node_modules/jquery-mask-plugin/dist/jquery.mask.js" }} + {{ $scrolljs := resources.Get "scripts/scroll-effect.js" }} + {{ $maskjs := resources.Get "scripts/phone-masking.js" }} + {{ $ttjs := resources.Get "scripts/tooltip-enable.js" }} + {{ $alljs := slice $jqueryjs $popperjs $twbsjs $fajs $fittextjs $scrolljs $jqmaskjs $maskjs $ttjs | resources.Concat + "js/bundle.js" | minify | fingerprint + }} + + diff --git a/layouts/academia/list.html b/layouts/academia/list.html index 8f44adf..9a1dba6 100644 --- a/layouts/academia/list.html +++ b/layouts/academia/list.html @@ -1,14 +1,14 @@ {{ define "main" }} -

Selected Presentations

- {{ $featuredpubs := where .Pages ".Params.featured" "==" true }} - {{ range $featuredpubs }} - {{ .Scratch.Set "showAbstract" true }} - {{ partial "academia/list-single.html" . }} - {{ end }} -
-

Other Presentations

- {{ $nonfeaturedpubs := where .Pages ".Params.featured" "==" false }} - {{ range $nonfeaturedpubs }} - {{ partial "academia/list-single.html" . }} - {{ end }} +

Selected Presentations

+ {{ $featuredpubs := where .Pages ".Params.featured" "==" true }} + {{ range $featuredpubs }} + {{ .Scratch.Set "showAbstract" true }} + {{ partial "academia/list-single.html" . }} + {{ end }} +
+

Other Presentations

+ {{ $nonfeaturedpubs := where .Pages ".Params.featured" "==" false }} + {{ range $nonfeaturedpubs }} + {{ partial "academia/list-single.html" . }} + {{ end }} {{ end }} diff --git a/layouts/partials/academia/list-single.html b/layouts/partials/academia/list-single.html index 047a1f5..7858763 100644 --- a/layouts/partials/academia/list-single.html +++ b/layouts/partials/academia/list-single.html @@ -1,47 +1,72 @@
-
-

- {{ if eq .Params.type "poster" }}{{ end }} - {{ if eq .Params.type "thesis" }}{{ end }} - {{ if eq .Params.type "presentation" }}{{ end }} -

- {{ 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 }} -
+
+

+ {{ if eq .Params.type "poster" }} + + {{ end }} + {{ if eq .Params.type "thesis" }} + + {{ end }} + {{ if eq .Params.type "presentation" }} + + {{ end }} +

+ {{ 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 }} +
diff --git a/layouts/videos/list.html b/layouts/videos/list.html index 2ba6960..56bb374 100644 --- a/layouts/videos/list.html +++ b/layouts/videos/list.html @@ -1,14 +1,19 @@ {{ define "main" }} - {{ .Content }} + {{ .Content }} -
- {{ range .Pages }} -
- - Thumbnail of {{ .Title }} -

{{ .Title }}

-
-
- {{ end }} -
+ +
+ {{ range .Pages }} +
+ + Thumbnail of {{ .Title }} +

{{ .Title }}

+
+
+ {{ end }} +
{{ end }} diff --git a/layouts/videos/single.html b/layouts/videos/single.html index b2a6a25..85bc3a1 100644 --- a/layouts/videos/single.html +++ b/layouts/videos/single.html @@ -1,25 +1,26 @@ {{ define "main" }} - {{ if eq .Params.storage "yt" }} - {{ .Scratch.Set "embedLink" (print "https://www.youtube-nocookie.com/embed/" .Params.storageId) }} - {{ end }} - {{ if eq .Params.storage "vimeo" }} - {{ .Scratch.Set "embedLink" (print "https://player.vimeo.com/video/" .Params.storageId "?color=ffffff") }} - {{ end }} - {{ if eq .Params.storage "lbry" }} - {{ .Scratch.Set "embedLink" (print "https://odysee.com/$/embed/" .Params.storageId) }} - {{ end }} -
-
-
- -
-
+ {{ if eq .Params.storage "yt" }} + {{ .Scratch.Set "embedLink" (print "https://www.youtube-nocookie.com/embed/" .Params.storageId) }} + {{ end }} + {{ if eq .Params.storage "vimeo" }} + {{ .Scratch.Set "embedLink" (print "https://player.vimeo.com/video/" .Params.storageId "?color=ffffff") }} + {{ end }} + {{ if eq .Params.storage "lbry" }} + {{ .Scratch.Set "embedLink" (print "https://odysee.com/$/embed/" .Params.storageId) }} + {{ end }} +
+
+
+ +
+
- {{ .Content }} + {{ .Content }} {{ end }} diff --git a/postcss.config.js b/postcss.config.js index 259237a..d0a0b99 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,13 +1,11 @@ -const purgecss = require('postcss-purgecss')({ - content: ['./hugo_stats.json'], - defaultExtractor: (content) => { - let els = JSON.parse(content).htmlElements; - return els.tags.concat(els.classes, els.ids); - } +const purgecss = require("postcss-purgecss")({ + content: ["./hugo_stats.json"], + defaultExtractor: (content) => { + let els = JSON.parse(content).htmlElements; + return els.tags.concat(els.classes, els.ids); + }, }); module.exports = { - plugins: [ - purgecss - ] -} + plugins: [purgecss], +};