Fixing configs and merge conflicts

.gitea/workflows/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 && pwd && ls -a && 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/
+          key: ${{ secrets.PRIVATE_KEY }}
+

main-site/themes/temper/layouts/_default/single.html

@@ -4,14 +4,14 @@
   {{  if .Params.Description }}
   <div class="container">
     <h5>{{ .Params.Description }}</h5>
-  </div>
+    {{  if .Params.Thumbnail }}
-  {{ end }}
+      {{ if .Params.ContentThumbnail }}
-  {{  if .Params.Thumbnail }}
+        <a href="{{ .Params.Thumbnail }}">
-    {{ if .Params.ContentThumbnail }}
+          <img class="card-img" src="{{ .Params.Thumbnail }}">
-      <a href="{{ .Params.Thumbnail }}">
+        </a>
-        <img class="card-img" src="{{ .Params.Thumbnail }}">
+      {{ end }}
-      </a>
     {{ end }}
+  </div>
   {{ end }}
   <div class="container">{{ .Content }}</div>
 {{ end }}

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;
 }