From 722229fe55e6bc799adecec513facf2fcb7bf865 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 11:50:14 -0600 Subject: [PATCH 1/7] Apply Prettier to stylesheet --- assets/styles/mix-twbs.scss | 258 ++++++++++++++++++------------------ 1 file changed, 128 insertions(+), 130 deletions(-) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 57425fc..6526812 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -1,143 +1,141 @@ +$web-font-path: "/fonts/nunito-sans/index.css"; - - $web-font-path: "/fonts/nunito-sans/index.css"; - - @import "bootstrap/functions"; - @import "bootswatch/lux/variables"; - @import "bootstrap/bootstrap"; - @import "bootswatch/lux/bootswatch"; +@import "bootstrap/functions"; +@import "bootswatch/lux/variables"; +@import "bootstrap/bootstrap"; +@import "bootswatch/lux/bootswatch"; .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, 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; + -webkit-text-stroke: 0.3px $gray-100; +} + +.blurred-container .img-src { + position: fixed; + width: 100%; + min-height: 35vh; + height: 72ex; + background-repeat: no-repeat; + background-size: cover; + background-position: center center; +} + +.blur { + opacity: 0; +} + +.list-main { + position: relative; + background-color: #fff; + padding-bottom: calc(1rem + 95px); + padding-top: 1rem; +} + +.footer-contents { + position: relative; + background-color: $gray-200; +} + +/* 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%; } - .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; + .w-md-50 { + width: 50%; } +} - .motto h1 { - background: #0000007d; - -webkit-text-stroke: 0.3px $gray-100; - } +h1 small { + font-size: 60%; + color: #9a9a9a; + font-weight: 300; + line-height: 1.5; +} - .blurred-container .img-src { - position: fixed; - width: 100%; - min-height: 35vh; - height: 72ex; - background-repeat: no-repeat; - background-size: cover; - background-position: center center; - } +h1 { + font-weight: 400; + margin: 30px 0 15px; +} - .blur { - opacity: 0; - } +.dogear { + clip-path: polygon(0 0, 0 100%, 100% 100%, 100% 25%, 75% 0); +} - .list-main { - position: relative; - background-color: #fff; - padding-bottom: calc(1rem + 95px); - padding-top: 1rem; - } - - .footer-contents { - position: relative; - background-color: $gray-200; - } - - /* 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; - } +.fa-stack-top { + vertical-align: top; +} .table-condensed th { padding: 0.5rem; From 1053d56c44d2111e1e648671535aee8156c8d593 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 11:50:53 -0600 Subject: [PATCH 2/7] Add SASS to Prettier format list --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5d5464..f68f5b5 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "prettier-plugin-toml": "^0.3.1" }, "lint-staged": { - "*.{js,css,md,toml,yml,yaml,json}": "prettier --write" + "*.{js,css,scss,md,toml,yml,yaml,json}": "prettier --write" }, "scripts": { "prepare": "husky install" From 22d8a08420d1c063ca3e4ced60503a7f20c77bae Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 11:52:27 -0600 Subject: [PATCH 3/7] Fix mismatch in peeking window heights --- assets/styles/mix-twbs.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 6526812..250cd8d 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -5,11 +5,13 @@ $web-font-path: "/fonts/nunito-sans/index.css"; @import "bootstrap/bootstrap"; @import "bootswatch/lux/bootswatch"; +$peek-height: 25rem; + .blurred-container { position: relative; width: 100%; min-height: 35vh; - height: 350px; + height: $peek-height; top: 0; left: 0; } @@ -39,7 +41,7 @@ $web-font-path: "/fonts/nunito-sans/index.css"; position: fixed; width: 100%; min-height: 35vh; - height: 72ex; + height: $peek-height; background-repeat: no-repeat; background-size: cover; background-position: center center; From e4e1adba0ada3d17e5437537cc9aca8ac1bd809c Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 11:53:29 -0600 Subject: [PATCH 4/7] Make motto lines more compact --- assets/styles/mix-twbs.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 250cd8d..2687642 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -35,6 +35,7 @@ $peek-height: 25rem; .motto h1 { background: #0000007d; -webkit-text-stroke: 0.3px $gray-100; + line-height: 1; } .blurred-container .img-src { From e11e6bfc712bbe81c9da844c3131830b884211a1 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:15:03 -0600 Subject: [PATCH 5/7] Confine footer to content area width --- assets/styles/mix-twbs.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/styles/mix-twbs.scss b/assets/styles/mix-twbs.scss index 2687642..034dd8f 100644 --- a/assets/styles/mix-twbs.scss +++ b/assets/styles/mix-twbs.scss @@ -147,3 +147,9 @@ h1 { .table-condensed td { padding: 0.5rem; } + +@media (min-width: map-get($grid-breakpoints, md)) { + .fixed-bottom { + left: 25%; + } +} From ce4b4c069cf391cb9a789f47f3ae5f86a60faa03 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:20:36 -0600 Subject: [PATCH 6/7] Add description to base template --- layouts/_default/baseof.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e214c6e..c8c15db 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,6 +4,9 @@ + {{ with .Description }} + + {{ end }} {{ .Title }} - {{ .Site.Title }} {{ $twbssass := resources.Get "styles/mix-twbs.scss" | resources.ToCSS | minify | resources.PostProcess }} From ce86bea3174c089575ff3bfb994febeb18a1a820 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Thu, 9 Feb 2023 12:25:54 -0600 Subject: [PATCH 7/7] Add descriptions to main index pages --- content/academia/_index.md | 1 + content/ai/_index.md | 2 ++ content/contact/_index.html | 1 + content/videos/_index.md | 1 + content/websites/_index.md | 1 + 5 files changed, 6 insertions(+) diff --git a/content/academia/_index.md b/content/academia/_index.md index 1dc5b39..390da5b 100644 --- a/content/academia/_index.md +++ b/content/academia/_index.md @@ -2,6 +2,7 @@ title: Academic Publications and Presentations motto: Publications and Presentations cardImage: library +decription: A list of my academic publications --- ### Academic Papers diff --git a/content/ai/_index.md b/content/ai/_index.md index ccf308d..d9fd664 100644 --- a/content/ai/_index.md +++ b/content/ai/_index.md @@ -2,6 +2,8 @@ title: Artificial Insemination cardImage: Ai-calf motto: Artificial Insemination +description: + Advertising page to try and sell my artificial insemination services --- I am licensed in the Great State of Wyoming as a food animal artificial diff --git a/content/contact/_index.html b/content/contact/_index.html index ea2beec..6d62e29 100644 --- a/content/contact/_index.html +++ b/content/contact/_index.html @@ -2,6 +2,7 @@ title: Contact Me cardImage: venice-mailbox motto: Contact Me +description: Contact form to get ahold of me ---
### The culmination of all art forms is that of film. diff --git a/content/websites/_index.md b/content/websites/_index.md index ef829fc..0185a0f 100644 --- a/content/websites/_index.md +++ b/content/websites/_index.md @@ -2,6 +2,7 @@ title: My Websites cardImage: eclipse motto: Websites +description: List of websites that I have worked on --- I do occasionally build websites for myself and other people. Here is a list of