diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index 4ea8f58..cc24aea 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -3,41 +3,22 @@ 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@v3
+ uses: actions/checkout@v2
with:
submodules: true
- fetch-depth: 0
- - name: Setup pages
- id: pages
- uses: actions/configure-pages@v2
- name: Setup Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v2
with:
- node-version: "${{ env.NODE_VERSION }}"
+ node-version: lts/*
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: "${{ env.HUGO_VERSION }}"
+ hugo-version: "latest"
extended: true
- name: Configure npm
run: |
@@ -48,18 +29,16 @@ jobs:
npm -g install postcss-cli
- name: Install npm packages
run: |
- npm ci
+ npm install
- name: Run Hugo
run: |
hugo --environment production --minify
- - name: Upload artifact
- uses: actions/upload-pages-artifact@v1
- with:
- path: ./public
- name: Deploy to gh-pages
- if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
- uses: peaceiris/actions-gh-pages@v3
+ if: ${{ !env.ACT }}
+ uses: rdarida/simple-github-pages-deploy-action@v1
with:
- deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
- publish_dir: ./public
- cname: millironx.com
+ git-user: "MillironX"
+ git-email: "25492070+MillironX@users.noreply.github.com"
+ git-base-folder: "public"
+ commit-message: "Build and deploy"
+ branch: "gh-pages"
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5154615
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[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 100755
new mode 100644
diff --git a/assets/images/brandedbull.png b/assets/images/brandedbull.png
deleted file mode 100644
index 9c785d4..0000000
Binary files a/assets/images/brandedbull.png and /dev/null differ
diff --git a/assets/styles/main.css b/assets/styles/main.css
new file mode 100644
index 0000000..40973e3
--- /dev/null
+++ b/assets/styles/main.css
@@ -0,0 +1,123 @@
+.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
deleted file mode 100644
index 10a06af..0000000
--- a/assets/styles/mix-twbs.scss
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
- $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 ff79378..b81b4a2 100644
--- a/config.toml
+++ b/config.toml
@@ -44,14 +44,6 @@ 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 1dc5b39..369bfee 100644
--- a/content/academia/_index.md
+++ b/content/academia/_index.md
@@ -1,6 +1,6 @@
---
title: Academic Publications and Presentations
-motto: Publications and Presentations
+motto: Academic Publications and Presentations
cardImage: library
---
diff --git a/content/blogroll/_index.md b/content/blogroll/_index.md
index 2a17fb5..da82281 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 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.
+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.
### [Proglogion](https://blog.drwile.com/)
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index bad1632..4d92820 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,13 +5,15 @@
{{ .Title }} - {{ .Site.Title }}
- {{ $twbssass := resources.Get "styles/mix-twbs.scss" | resources.ToCSS | minify | resources.PostProcess }}
-
+ {{ $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 }}
+
{{ $millironx := resources.Get "graphics/millironx.svg" }}
-
{{ block "main" . }}
-
-
+
- {{ end }}
-
+
+ {{ end }}
@@ -133,12 +129,5 @@
{{ $ttjs := resources.Get "scripts/tooltip-enable.js" | minify }}
{{ $bootstrapbundle := slice $popperjs $twbsjs $ttjs | resources.Concat "js/bootstrap-bundle.js" | fingerprint }}
-
-
-