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
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/.husky/pre-commit b/.husky/pre-commit
old mode 100644
new mode 100755
diff --git a/assets/images/brandedbull.png b/assets/images/brandedbull.png
new file mode 100644
index 0000000..9c785d4
Binary files /dev/null and b/assets/images/brandedbull.png differ
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..10a06af
--- /dev/null
+++ b/assets/styles/mix-twbs.scss
@@ -0,0 +1,146 @@
+
+
+ $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%;
+ 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: 350px;
+ 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 {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ }
+
+ .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;
+ }
diff --git a/config.toml b/config.toml
index b81b4a2..ff79378 100644
--- a/config.toml
+++ b/config.toml
@@ -44,6 +44,14 @@ 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/@openfonts/nunito-sans_all"
+target = "static/fonts/nunito-sans"
+
[[module.mounts]]
source = "./node_modules/bootstrap/dist/js"
target = "assets/scripts/bootstrap"
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
---
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/)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4d92820..bad1632 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,15 +5,13 @@
{{ .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" }}
+
{{ block "main" . }}
-
{{ end }}
+
@@ -129,5 +133,12 @@
{{ $ttjs := resources.Get "scripts/tooltip-enable.js" | minify }}
{{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" | fingerprint }}
+
+
+