From 35ef660878190f2f2d4454f4609411a7e84b88e2 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 21:14:34 -0600 Subject: [PATCH 01/15] Switch styles to Sass --- assets/styles/main.css | 123 ---------------------------------- assets/styles/mix-twbs.scss | 125 +++++++++++++++++++++++++++++++++++ layouts/_default/baseof.html | 7 +- 3 files changed, 127 insertions(+), 128 deletions(-) delete mode 100644 assets/styles/main.css create mode 100644 assets/styles/mix-twbs.scss diff --git a/assets/styles/main.css b/assets/styles/main.css deleted file mode 100644 index 40973e3..0000000 --- a/assets/styles/main.css +++ /dev/null @@ -1,123 +0,0 @@ -.blurred-container { - 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, 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; -} - -.blurred-container .img-src { - position: fixed; - width: 100%; - min-height: 35vh; - height: 350px; - background-repeat: no-repeat; - background-size: cover; - background-position: center center; -} - -.blur { - opacity: 0; -} - -.list-main { - position: relative; - background-color: #fff; -} - -/* Gives me greater control over fonts */ -.font-serif { - font-family: Georgia, "Times New Roman", Times, serif; -} - -.font-sans { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -.font-mono { - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; -} - -.font-small-caps { - font-variant-caps: small-caps; -} - -.strikethrough { - text-decoration: line-through; -} - -.sfTable { - margin: 0 auto; -} - -.text-align-left { - text-align: left; -} - -.text-align-right { - text-align: right; -} - -.float-left { - float: left; -} - -.float-right { - float: right; -} - -.media-object { - max-height: 100%; - max-width: 100%; -} - -@media (min-width: 768px) { - .pull-left { - max-width: 25%; - } - - .w-md-50 { - width: 50%; - } -} - -h1 small { - font-size: 60%; - color: #9a9a9a; - font-weight: 300; - line-height: 1.5; -} - -h1 { - font-weight: 400; - margin: 30px 0 15px; -} - -.dogear { - clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 25%, 75% 0); -} - -.fa-stack-top { - vertical-align: top; -} diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss new file mode 100644 index 0000000..2b8230d --- /dev/null +++ b/assets/styles/mix-twbs.scss @@ -0,0 +1,125 @@ +.blurred-container { + 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, 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; + } + + .blurred-container .img-src { + position: fixed; + width: 100%; + min-height: 35vh; + height: 350px; + background-repeat: no-repeat; + background-size: cover; + background-position: center center; + } + + .blur { + opacity: 0; + } + + .list-main { + position: relative; + background-color: #fff; + } + + /* Gives me greater control over fonts */ + .font-serif { + font-family: Georgia, "Times New Roman", Times, serif; + } + + .font-sans { + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + } + + .font-mono { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + } + + .font-small-caps { + font-variant-caps: small-caps; + } + + .strikethrough { + text-decoration: line-through; + } + + .sfTable { + margin: 0 auto; + } + + .text-align-left { + text-align: left; + } + + .text-align-right { + text-align: right; + } + + .float-left { + float: left; + } + + .float-right { + float: right; + } + + .media-object { + max-height: 100%; + max-width: 100%; + } + + @media (min-width: 768px) { + .pull-left { + max-width: 25%; + } + + .w-md-50 { + width: 50%; + } + } + + h1 small { + font-size: 60%; + color: #9a9a9a; + font-weight: 300; + line-height: 1.5; + } + + h1 { + font-weight: 400; + margin: 30px 0 15px; + } + + .dogear { + clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 25%, 75% 0); + } + + .fa-stack-top { + vertical-align: top; + } + +@import "bootstrap/bootstrap"; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 4d92820..0ec6d3f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,11 +5,8 @@ {{ .Title }} - {{ .Site.Title }} - {{ $twbscss := resources.Get "styles/bootstrap/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 }} - + {{ $twbssass := resources.Get "styles/mix-twbs.scss" | resources.ToCSS | minify | resources.PostProcess }} + {{ $millironx := resources.Get "graphics/millironx.svg" }} From 9002e545250ddc829dfa5760d047d3e059c35b5f Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 21:15:50 -0600 Subject: [PATCH 02/15] Install Bootswatch and font packages --- package-lock.json | 256 +++++++++++++++++++++++++--------------------- package.json | 2 + 2 files changed, 141 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30385b3..5f4174b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,10 @@ "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-brands-svg-icons": "^6.2.0", "@fortawesome/pro-duotone-svg-icons": "^6.2.0", + "@openfonts/nunito-sans_all": "^1.44.2", "@popperjs/core": "^2.11.4", "bootstrap": "^5.1.3", + "bootswatch": "^5.2.2", "fittext.js": "^1.2.0", "jquery": "^3.6.0", "jquery-mask-plugin": "^1.14.16", @@ -29,46 +31,51 @@ } }, "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.2.0/fontawesome-common-types-6.2.0.tgz", - "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.2.1/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==", "engines": { "node": ">=6" } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.2.0/fontawesome-svg-core-6.2.0.tgz", - "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.2.1/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/6.2.0/free-brands-svg-icons-6.2.0.tgz", - "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/6.2.1/free-brands-svg-icons-6.2.1.tgz", + "integrity": "sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/pro-duotone-svg-icons": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/pro-duotone-svg-icons/-/6.2.0/pro-duotone-svg-icons-6.2.0.tgz", - "integrity": "sha512-cphSgDxTr+o7qhq6AW8RrBbVfIvIqA6c/Fcbx5WgculmER+Hv6cnuliw4CrZ6KhxsfRWQRLMiYLxgTctqlpB5g==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-duotone-svg-icons/-/6.2.1/pro-duotone-svg-icons-6.2.1.tgz", + "integrity": "sha512-8kG2rcHxGdb8yGb2KLZN7Ht014Nf4lefvXP+pihJAE9Jy515g/xPwglkFMu3Ue6MBtcdrLPIYirV8664ubAVgA==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" }, "engines": { "node": ">=6" } }, + "node_modules/@openfonts/nunito-sans_all": { + "version": "1.44.2", + "resolved": "https://registry.npmjs.org/@openfonts/nunito-sans_all/-/nunito-sans_all-1.44.2.tgz", + "integrity": "sha512-I4yZWRUcv0aQSpOlTIbXSLrjXQ1jGmwvDFh248ZaNyMTXl2bB0kW4LbUS3dYb+0craO7nwkcMtDAPLbqEo/Rwg==" + }, "node_modules/@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -138,9 +145,9 @@ } }, "node_modules/ansi-styles": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", - "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true, "engines": { "node": ">=12" @@ -164,9 +171,9 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/bootstrap": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", - "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", "funding": [ { "type": "github", @@ -181,6 +188,11 @@ "@popperjs/core": "^2.11.6" } }, + "node_modules/bootswatch": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.2.3.tgz", + "integrity": "sha512-tvnW15WoOY2sEp1uT1ITDQiJy2TekQa+K+Q28WDXibleIxsY0nAoC9IylbnUPD7Q5vkCIclOuBHLVBblJYYPSA==" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -490,9 +502,9 @@ } }, "node_modules/husky": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", - "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.2.tgz", + "integrity": "sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==", "dev": true, "bin": { "husky": "lib/bin.js" @@ -567,9 +579,9 @@ "dev": true }, "node_modules/jquery": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", - "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "node_modules/jquery-mask-plugin": { "version": "1.14.16", @@ -577,33 +589,33 @@ "integrity": "sha512-reywdHlYEkPbzWjTpcc1fk9XQ3PLvO5dzEAVqy8zI7NTF22tB1HbeU3iboZTLdkBEPaWAqeI2HtEjsGQ4roZKw==" }, "node_modules/lilconfig": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", + "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==", "dev": true, "engines": { "node": ">=10" } }, "node_modules/lint-staged": { - "version": "13.0.3", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz", - "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.1.0.tgz", + "integrity": "sha512-pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==", "dev": true, "dependencies": { "cli-truncate": "^3.1.0", - "colorette": "^2.0.17", - "commander": "^9.3.0", + "colorette": "^2.0.19", + "commander": "^9.4.1", "debug": "^4.3.4", "execa": "^6.1.0", - "lilconfig": "2.0.5", - "listr2": "^4.0.5", + "lilconfig": "2.0.6", + "listr2": "^5.0.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-inspect": "^1.12.2", "pidtree": "^0.6.0", "string-argv": "^0.3.1", - "yaml": "^2.1.1" + "yaml": "^2.1.3" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -616,22 +628,22 @@ } }, "node_modules/listr2": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", - "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.6.tgz", + "integrity": "sha512-u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag==", "dev": true, "dependencies": { "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", + "colorette": "^2.0.19", "log-update": "^4.0.0", "p-map": "^4.0.0", "rfdc": "^1.3.0", - "rxjs": "^7.5.5", + "rxjs": "^7.5.7", "through": "^2.3.8", "wrap-ansi": "^7.0.0" }, "engines": { - "node": ">=12" + "node": "^14.13.1 || >=16.0.0" }, "peerDependencies": { "enquirer": ">= 2.3.0 < 3" @@ -1040,9 +1052,9 @@ } }, "node_modules/postcss": { - "version": "8.4.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.17.tgz", - "integrity": "sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==", + "version": "8.4.20", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz", + "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==", "funding": [ { "type": "opencollective", @@ -1089,9 +1101,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", + "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -1101,9 +1113,9 @@ } }, "node_modules/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -1241,9 +1253,9 @@ "dev": true }, "node_modules/rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", + "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -1391,9 +1403,9 @@ } }, "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", "dev": true }, "node_modules/type-fest": { @@ -1536,34 +1548,39 @@ }, "dependencies": { "@fortawesome/fontawesome-common-types": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.2.0/fontawesome-common-types-6.2.0.tgz", - "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==" + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.2.1/fontawesome-common-types-6.2.1.tgz", + "integrity": "sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==" }, "@fortawesome/fontawesome-svg-core": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.2.0/fontawesome-svg-core-6.2.0.tgz", - "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.2.1/fontawesome-svg-core-6.2.1.tgz", + "integrity": "sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==", "requires": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" } }, "@fortawesome/free-brands-svg-icons": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/6.2.0/free-brands-svg-icons-6.2.0.tgz", - "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-brands-svg-icons/-/6.2.1/free-brands-svg-icons-6.2.1.tgz", + "integrity": "sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==", "requires": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" } }, "@fortawesome/pro-duotone-svg-icons": { - "version": "6.2.0", - "resolved": "https://npm.fontawesome.com/@fortawesome/pro-duotone-svg-icons/-/6.2.0/pro-duotone-svg-icons-6.2.0.tgz", - "integrity": "sha512-cphSgDxTr+o7qhq6AW8RrBbVfIvIqA6c/Fcbx5WgculmER+Hv6cnuliw4CrZ6KhxsfRWQRLMiYLxgTctqlpB5g==", + "version": "6.2.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-duotone-svg-icons/-/6.2.1/pro-duotone-svg-icons-6.2.1.tgz", + "integrity": "sha512-8kG2rcHxGdb8yGb2KLZN7Ht014Nf4lefvXP+pihJAE9Jy515g/xPwglkFMu3Ue6MBtcdrLPIYirV8664ubAVgA==", "requires": { - "@fortawesome/fontawesome-common-types": "6.2.0" + "@fortawesome/fontawesome-common-types": "6.2.1" } }, + "@openfonts/nunito-sans_all": { + "version": "1.44.2", + "resolved": "https://registry.npmjs.org/@openfonts/nunito-sans_all/-/nunito-sans_all-1.44.2.tgz", + "integrity": "sha512-I4yZWRUcv0aQSpOlTIbXSLrjXQ1jGmwvDFh248ZaNyMTXl2bB0kW4LbUS3dYb+0craO7nwkcMtDAPLbqEo/Rwg==" + }, "@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -1614,9 +1631,9 @@ "dev": true }, "ansi-styles": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", - "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true }, "astral-regex": { @@ -1631,11 +1648,16 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "bootstrap": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", - "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", + "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", "requires": {} }, + "bootswatch": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-5.2.3.tgz", + "integrity": "sha512-tvnW15WoOY2sEp1uT1ITDQiJy2TekQa+K+Q28WDXibleIxsY0nAoC9IylbnUPD7Q5vkCIclOuBHLVBblJYYPSA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1870,9 +1892,9 @@ "dev": true }, "husky": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", - "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.2.tgz", + "integrity": "sha512-Tkv80jtvbnkK3mYWxPZePGFpQ/tT3HNSs/sasF9P2YfkMezDl3ON37YN6jUUI4eTg5LcyVynlb6r4eyvOmspvg==", "dev": true }, "indent-string": { @@ -1920,9 +1942,9 @@ "dev": true }, "jquery": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", - "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "jquery-mask-plugin": { "version": "1.14.16", @@ -1930,44 +1952,44 @@ "integrity": "sha512-reywdHlYEkPbzWjTpcc1fk9XQ3PLvO5dzEAVqy8zI7NTF22tB1HbeU3iboZTLdkBEPaWAqeI2HtEjsGQ4roZKw==" }, "lilconfig": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", + "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==", "dev": true }, "lint-staged": { - "version": "13.0.3", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz", - "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.1.0.tgz", + "integrity": "sha512-pn/sR8IrcF/T0vpWLilih8jmVouMlxqXxKuAojmbiGX5n/gDnz+abdPptlj0vYnbfE0SQNl3CY/HwtM0+yfOVQ==", "dev": true, "requires": { "cli-truncate": "^3.1.0", - "colorette": "^2.0.17", - "commander": "^9.3.0", + "colorette": "^2.0.19", + "commander": "^9.4.1", "debug": "^4.3.4", "execa": "^6.1.0", - "lilconfig": "2.0.5", - "listr2": "^4.0.5", + "lilconfig": "2.0.6", + "listr2": "^5.0.5", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-inspect": "^1.12.2", "pidtree": "^0.6.0", "string-argv": "^0.3.1", - "yaml": "^2.1.1" + "yaml": "^2.1.3" } }, "listr2": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", - "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-5.0.6.tgz", + "integrity": "sha512-u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag==", "dev": true, "requires": { "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", + "colorette": "^2.0.19", "log-update": "^4.0.0", "p-map": "^4.0.0", "rfdc": "^1.3.0", - "rxjs": "^7.5.5", + "rxjs": "^7.5.7", "through": "^2.3.8", "wrap-ansi": "^7.0.0" }, @@ -2250,9 +2272,9 @@ "dev": true }, "postcss": { - "version": "8.4.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.17.tgz", - "integrity": "sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==", + "version": "8.4.20", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz", + "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==", "requires": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -2281,18 +2303,18 @@ } }, "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", + "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true }, "prettier-plugin-go-template": { @@ -2390,9 +2412,9 @@ "dev": true }, "rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", + "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", "dev": true, "requires": { "tslib": "^2.1.0" @@ -2495,9 +2517,9 @@ } }, "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", "dev": true }, "type-fest": { diff --git a/package.json b/package.json index 3a84ea2..b5d5464 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,10 @@ "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-brands-svg-icons": "^6.2.0", "@fortawesome/pro-duotone-svg-icons": "^6.2.0", + "@openfonts/nunito-sans_all": "^1.44.2", "@popperjs/core": "^2.11.4", "bootstrap": "^5.1.3", + "bootswatch": "^5.2.2", "fittext.js": "^1.2.0", "jquery": "^3.6.0", "jquery-mask-plugin": "^1.14.16", From b50a35cfb1ffabda29b5d4573ef7de88a313aacf Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 21:16:09 -0600 Subject: [PATCH 03/15] Add mount for Bootswatch --- config.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.toml b/config.toml index b81b4a2..77a25a7 100644 --- a/config.toml +++ b/config.toml @@ -44,6 +44,10 @@ target = "assets/scripts/popper" source = "./node_modules/bootstrap/scss" target = "assets/styles/bootstrap" +[[module.mounts]] +source = "./node_modules/bootswatch/dist/" +target = "assets/styles/bootswatch" + [[module.mounts]] source = "./node_modules/bootstrap/dist/js" target = "assets/scripts/bootstrap" From 2efb797c21931eb08768a1fb77425882f94d248e Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 21:19:37 -0600 Subject: [PATCH 04/15] Add mount for Nunito font --- config.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.toml b/config.toml index 77a25a7..ff79378 100644 --- a/config.toml +++ b/config.toml @@ -48,6 +48,10 @@ target = "assets/styles/bootstrap" source = "./node_modules/bootswatch/dist/" target = "assets/styles/bootswatch" +[[module.mounts]] +source = "./node_modules/@openfonts/nunito-sans_all" +target = "static/fonts/nunito-sans" + [[module.mounts]] source = "./node_modules/bootstrap/dist/js" target = "assets/scripts/bootstrap" From ea8913f30eb1676bba40d3d9f8b393131d8b5d97 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:25:22 -0600 Subject: [PATCH 05/15] Switch theme to Bootswatch lux --- assets/styles/mix-twbs.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 2b8230d..2997111 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -122,4 +122,9 @@ vertical-align: top; } -@import "bootstrap/bootstrap"; + $web-font-path: "/fonts/nunito-sans/index.css"; + + @import "bootstrap/functions"; + @import "bootswatch/lux/variables"; + @import "bootstrap/bootstrap"; + @import "bootswatch/lux/bootswatch"; From 5920af63c44cdd76dbb43ead08f152567d2c2a16 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:25:48 -0600 Subject: [PATCH 06/15] Correct spelling errors in blogroll --- content/blogroll/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/blogroll/_index.md b/content/blogroll/_index.md index da82281..2a17fb5 100644 --- a/content/blogroll/_index.md +++ b/content/blogroll/_index.md @@ -17,9 +17,9 @@ McGee does just that. ### [Enoch the Cow Vet](https://youtube.com/channel/UC6PPmHUbcdOSzX5tLB3uXdw) -A veternarian/agricultural channel that doesn't make me cringe. "God built these -things for cows for vets ... [there are] so many aspects of the cow that are -just designed for vets." Amen, Enoch. Amen. +A veterinarian/agricultural channel that doesn't make me cringe. "God built +these things for cows for vets ... [there are] so many aspects of the cow that +are just designed for vets." Amen, Enoch. Amen. ### [Proglogion](https://blog.drwile.com/) From ff8dc5865fdc26fe9334caaca6c71166325df420 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:39:09 -0600 Subject: [PATCH 07/15] Add stroke to make headings more readable --- assets/styles/mix-twbs.scss | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 2997111..f515e93 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -1,3 +1,12 @@ + + + $web-font-path: "/fonts/nunito-sans/index.css"; + + @import "bootstrap/functions"; + @import "bootswatch/lux/variables"; + @import "bootstrap/bootstrap"; + @import "bootswatch/lux/bootswatch"; + .blurred-container { position: relative; width: 100%; @@ -25,6 +34,7 @@ .motto h1 { background: #0000007d; + -webkit-text-stroke: 0.1px $gray-100; } .blurred-container .img-src { @@ -121,10 +131,3 @@ .fa-stack-top { vertical-align: top; } - - $web-font-path: "/fonts/nunito-sans/index.css"; - - @import "bootstrap/functions"; - @import "bootswatch/lux/variables"; - @import "bootstrap/bootstrap"; - @import "bootswatch/lux/bootswatch"; From fe51da1a48b3f25329d6a7f26325845bf74d1cf7 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 19:11:28 -0600 Subject: [PATCH 08/15] Make pre-commit hooks executable --- .husky/pre-commit | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100644 new mode 100755 From a6b10b56b7b27c63f400666971292fd74dd1d5a1 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 19:16:58 -0600 Subject: [PATCH 09/15] Add stroke to motto text --- assets/styles/mix-twbs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index f515e93..15361ab 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -34,7 +34,7 @@ .motto h1 { background: #0000007d; - -webkit-text-stroke: 0.1px $gray-100; + -webkit-text-stroke: 0.3px $gray-100; } .blurred-container .img-src { From 32d9c5dcc23d2bd6bb37a236d0a9143f88d62eff Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 19:18:36 -0600 Subject: [PATCH 10/15] Change visible title of academia page --- content/academia/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/academia/_index.md b/content/academia/_index.md index 369bfee..1dc5b39 100644 --- a/content/academia/_index.md +++ b/content/academia/_index.md @@ -1,6 +1,6 @@ --- title: Academic Publications and Presentations -motto: Academic Publications and Presentations +motto: Publications and Presentations cardImage: library --- From 9d1ec4fb42465a67bd6d27610c03ee3b27b0e5ba Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 19:23:05 -0600 Subject: [PATCH 11/15] Add GoatCounter --- layouts/_default/baseof.html | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0ec6d3f..604c955 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,12 +5,13 @@ {{ .Title }} - {{ .Site.Title }} - {{ $twbssass := resources.Get "styles/mix-twbs.scss" | resources.ToCSS | minify | resources.PostProcess }} - + {{ $twbssass := resources.Get "styles/mix-twbs.scss" | resources.ToCSS | minify | resources.PostProcess }} + {{ $millironx := resources.Get "graphics/millironx.svg" }} +
@@ -65,8 +66,7 @@
  • - Artificial Insemination + Artificial Insemination
  • @@ -98,11 +98,11 @@
    • {{ block "main" . }} -
    -
    +
    +
    {{ .Content }} -
    -
    +
    +
    {{ end }}
    @@ -126,5 +126,12 @@ {{ $ttjs := resources.Get "scripts/tooltip-enable.js" | minify }} {{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" | fingerprint }} + + + From 2babd5250d1f40562a98b2472669ee433d0ac22e Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 19:57:07 -0600 Subject: [PATCH 12/15] Add branded bull image back in --- assets/images/brandedbull.png | Bin 0 -> 10410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/images/brandedbull.png diff --git a/assets/images/brandedbull.png b/assets/images/brandedbull.png new file mode 100644 index 0000000000000000000000000000000000000000..9c785d4118dc32c6002e59e6af46e1b7c107207d GIT binary patch literal 10410 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 R>p!;#0dlIc)zT&*{|kBz8Djtd literal 0 HcmV?d00001 From c3567f03e1b8ff7b06170fd3093ea0569809443c Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 21:11:25 -0600 Subject: [PATCH 13/15] Add bull footer back in --- assets/styles/mix-twbs.scss | 13 +++++++++++++ layouts/_default/baseof.html | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 15361ab..10a06af 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -54,6 +54,19 @@ .list-main { position: relative; background-color: #fff; + padding-bottom: calc(1rem + 95px); + padding-top: 1rem; + } + + footer { + position: fixed; + bottom: 0; + width: 100%; + } + + .footer-contents { + position: relative; + background-color: $gray-200; } /* Gives me greater control over fonts */ diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 604c955..bad1632 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -104,6 +104,13 @@ {{ end }} + From 5c242f80b1700b0887daa3be799af68dfc774210 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 22:23:45 -0600 Subject: [PATCH 14/15] Remove ananke submodule --- .gitmodules | 3 --- themes/ananke | 1 - 2 files changed, 4 deletions(-) delete mode 100644 .gitmodules delete mode 160000 themes/ananke diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 5154615..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "themes/ananke"] - path = themes/ananke - url = https://github.com/theNewDynamic/gohugo-theme-ananke.git diff --git a/themes/ananke b/themes/ananke deleted file mode 160000 index 36c029a..0000000 --- a/themes/ananke +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36c029abb9551e247e83789d6b3a02c2299a14e1 From b2f77179d6f52b2f3816a2a5f14e1c8b2104074a Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Mon, 2 Jan 2023 22:28:16 -0600 Subject: [PATCH 15/15] Update deployment to Github Actions --- .github/workflows/build-site.yml | 47 +++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index cc24aea..4ea8f58 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -3,22 +3,41 @@ on: push: branches: - master + workflow_dispatch: +permissions: + contents: read + pages: write + id-token: write +concurrency: + group: "pages" + cancel-in-progress: true +defaults: + run: + shell: bash + jobs: build: runs-on: ubuntu-latest + env: + HUGO_VERSION: 0.108.0 + NODE_VERSION: 18.12.1 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true + fetch-depth: 0 + - name: Setup pages + id: pages + uses: actions/configure-pages@v2 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: lts/* + node-version: "${{ env.NODE_VERSION }}" - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: - hugo-version: "latest" + hugo-version: "${{ env.HUGO_VERSION }}" extended: true - name: Configure npm run: | @@ -29,16 +48,18 @@ jobs: npm -g install postcss-cli - name: Install npm packages run: | - npm install + npm ci - name: Run Hugo run: | hugo --environment production --minify - - name: Deploy to gh-pages - if: ${{ !env.ACT }} - uses: rdarida/simple-github-pages-deploy-action@v1 + - name: Upload artifact + uses: actions/upload-pages-artifact@v1 with: - git-user: "MillironX" - git-email: "25492070+MillironX@users.noreply.github.com" - git-base-folder: "public" - commit-message: "Build and deploy" - branch: "gh-pages" + path: ./public + - name: Deploy to gh-pages + if: ${{ !env.ACT && github.ref == 'refs/heads/master' }} + uses: peaceiris/actions-gh-pages@v3 + with: + deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} + publish_dir: ./public + cname: millironx.com