From e1268b2d9cba5c5200418d247173e8d503e9f2d5 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 22:29:46 -0700 Subject: [PATCH 1/6] Adding pics and ci --- build-and-deploy.yml | 26 +++++++++++++++++++ main-site/static/img/26-07-2024/jacket-s1.jpg | 3 +++ main-site/static/img/26-07-2024/qtpi.jpg | 3 +++ main-site/static/img/26-07-2024/snoiler.jpg | 3 +++ 4 files changed, 35 insertions(+) create mode 100644 build-and-deploy.yml create mode 100644 main-site/static/img/26-07-2024/jacket-s1.jpg create mode 100644 main-site/static/img/26-07-2024/qtpi.jpg create mode 100644 main-site/static/img/26-07-2024/snoiler.jpg diff --git a/build-and-deploy.yml b/build-and-deploy.yml new file mode 100644 index 0000000..dc482e8 --- /dev/null +++ b/build-and-deploy.yml @@ -0,0 +1,26 @@ +name: Build and Deploy Resume Site +on: + push: + branches: + - master + +jobs: + setup-website-content: + runs-on: ubuntu-latest + container: + image: shockrah/hugo + steps: + - run: git init + - run: git remote add origin https://git.shockrah.xyz/shockrah/temper-tv.git + - run: git pull origin master + - name: Build website content + run: cd main-site && hugo + - name: Copy files with rsync + uses: tempersama/rsync-copy@2.6 + with: + host: shockrah.xyz + username: ${{ secrets.USER }} + source: "main-site/public/" + destination: /opt/nginx/temper.tv.test/ + key: ${{ secrets.PRIVATE_KEY }} + diff --git a/main-site/static/img/26-07-2024/jacket-s1.jpg b/main-site/static/img/26-07-2024/jacket-s1.jpg new file mode 100644 index 0000000..0a260fd --- /dev/null +++ b/main-site/static/img/26-07-2024/jacket-s1.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9065b5c45296aa85008628cad4dbb2eb9ecec43cc90da1b8c1c693552524645e +size 70786 diff --git a/main-site/static/img/26-07-2024/qtpi.jpg b/main-site/static/img/26-07-2024/qtpi.jpg new file mode 100644 index 0000000..57c4314 --- /dev/null +++ b/main-site/static/img/26-07-2024/qtpi.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2feb1064a84c24a55bce0ed4e32053d9c51d0c9bdad22f4e81e143a8353a3f7c +size 376788 diff --git a/main-site/static/img/26-07-2024/snoiler.jpg b/main-site/static/img/26-07-2024/snoiler.jpg new file mode 100644 index 0000000..0853603 --- /dev/null +++ b/main-site/static/img/26-07-2024/snoiler.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afedbca2e548d047e74026f764e3a2d7bdd6045f8ebf8694a81c5011ee722abc +size 265026 From 50c03da31d51edb0423f492b8a1de82e81c5b2fb Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 22:35:11 -0700 Subject: [PATCH 2/6] moving ci into workflows dir --- build-and-deploy.yml => .gitea/workflows/build-and-deploy.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build-and-deploy.yml => .gitea/workflows/build-and-deploy.yml (100%) diff --git a/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml similarity index 100% rename from build-and-deploy.yml rename to .gitea/workflows/build-and-deploy.yml From 54baae8ed83d4bb4c5460bee19a90bbac5f28773 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 22:38:28 -0700 Subject: [PATCH 3/6] Debugging file paths --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index dc482e8..28fdd58 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -14,7 +14,7 @@ jobs: - run: git remote add origin https://git.shockrah.xyz/shockrah/temper-tv.git - run: git pull origin master - name: Build website content - run: cd main-site && hugo + run: cd main-site && pwd && ls -a && hugo - name: Copy files with rsync uses: tempersama/rsync-copy@2.6 with: From 5a4316b00a908f3d334817ab080655894acf3c12 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 29 Sep 2024 23:36:08 -0700 Subject: [PATCH 4/6] Fixing target --- .gitea/workflows/build-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml index 28fdd58..ef0bfb4 100644 --- a/.gitea/workflows/build-and-deploy.yml +++ b/.gitea/workflows/build-and-deploy.yml @@ -21,6 +21,6 @@ jobs: host: shockrah.xyz username: ${{ secrets.USER }} source: "main-site/public/" - destination: /opt/nginx/temper.tv.test/ + destination: /opt/nginx/temper.tv/ key: ${{ secrets.PRIVATE_KEY }} From 9d357003e7b3025705967aac702b92ed2b0a6083 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 30 Sep 2024 16:15:14 -0700 Subject: [PATCH 5/6] Updating git link --- main-site/hugo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main-site/hugo.yaml b/main-site/hugo.yaml index 9fccd2a..da2cb36 100644 --- a/main-site/hugo.yaml +++ b/main-site/hugo.yaml @@ -10,7 +10,7 @@ Params: description: I like to make stuff name: temper.tv twitch: https://twitch.tv/shockrah - gitlab: https://gitlab.com/shockrah + gitlab: https://git.shockrah.xyz/shockrah github: https://github.com/tempersama mastodon: https://mastodon.social/@tempertv From ce7c682ef5dacfa1985b0a6679487cfaa95c3384 Mon Sep 17 00:00:00 2001 From: shockrah Date: Mon, 7 Oct 2024 16:22:06 -0700 Subject: [PATCH 6/6] Fixing the sizing on images in feeds and posts --- .../themes/temper/layouts/_default/single.html | 14 +++++++------- main-site/themes/temper/static/css/style.css | 6 +++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/main-site/themes/temper/layouts/_default/single.html b/main-site/themes/temper/layouts/_default/single.html index 5fb1db6..f3a34c5 100644 --- a/main-site/themes/temper/layouts/_default/single.html +++ b/main-site/themes/temper/layouts/_default/single.html @@ -4,14 +4,14 @@ {{ if .Params.Description }}
{{ .Params.Description }}
-
- {{ end }} - {{ if .Params.Thumbnail }} - {{ if .Params.ContentThumbnail }} - - - + {{ if .Params.Thumbnail }} + {{ if .Params.ContentThumbnail }} + + + + {{ end }} {{ end }} + {{ end }}
{{ .Content }}
{{ end }} diff --git a/main-site/themes/temper/static/css/style.css b/main-site/themes/temper/static/css/style.css index e8dada5..969901e 100644 --- a/main-site/themes/temper/static/css/style.css +++ b/main-site/themes/temper/static/css/style.css @@ -171,13 +171,17 @@ a:hover { color: #EAA221; } width: 80%; padding-bottom: 1em; } +.feed-container .a .card-img { + max-width: 60%; +} + .card { background-color: transparent; border-style: solid; border-width: 3px; padding: 1em; margin: 1em; - max-width: 75%; + max-width: 60%; min-width: 250px; }