Merge branch 'master' into weblate

Makefile

@@ -1,6 +1,8 @@
 ROOT_DIR		:= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 CURRENT_UID 	:= $(shell id -u)
 CURRENT_GID 	:= $(shell id -g)
+TARGET_REPO		?= "git@github.com:AlmaLinux/almalinux.org.git"
+TARGET_BRANCH	?= "master"
 
 .PHONY:		default
 default:	dev ;
@@ -56,7 +58,7 @@ assemble: # INTERNAL: assemble deployment asset for deployment
 	rm -rf tmp/deploy_out
 	mkdir -p tmp
 	mkdir -p tmp/deploy_out
-	git clone git@github.com:AlmaLinux/almalinux.org.git tmp/deploy
+	git clone ${TARGET_REPO} tmp/deploy --branch ${TARGET_BRANCH}
 	# Use local install .venv and node_modules to reuse local install as sort of a cache
 	cp -R .venv tmp/deploy
 	cp -R frontend/node_modules tmp/deploy/frontend

frontend/src/modules/page_blog/main.scss

@@ -81,6 +81,10 @@
 
     .al-article-content {
       color: $al-font-color;
+
+      img {
+        max-width: 100%;
+      }
     }
   }
 }

frontend/src/modules/page_page/main.scss

@@ -4,6 +4,12 @@
   max-width: $al-page-readable-max-width;
   margin: auto;
 
+  .al-page-content {
+    img {
+      max-width: 100%;
+    }
+  }
+
   .al-page-date {
     font-size: 0.7rem;
     color: #efefef;

kafe.lua

@@ -6,14 +6,25 @@ k.require_api(1)
 k.add_inventory('deploy', '18.213.64.210', 22, 'staging', 'website')
 k.add_inventory('deploy', '3.210.88.35', 22, 'production', 'website')
 
-k.task('deploy', function()
+k.task('deploy', function(repo, branch)
     local version = os.time(os.date('!*t'))
 
     k.define('deploy_to', '/opt/almalinux.org')
     k.define('public', '/var/www/almalinux.org')
     k.define('version', version)
 
-    k.local_shell('make assemble')
+    if repo == nil then
+        repo = 'git@github.com:AlmaLinux/almalinux.org.git'
+    end
+
+    if branch == nil then
+        branch = 'master'
+    end
+
+    k.define('repo', repo)
+    k.define('branch', branch)
+
+    k.local_shell('TARGET_REPO={{repo}} TARGET_BRANCH={{branch}} make assemble')
 
     local deploy = function()
         k.within('{{deploy_to}}')

www/templates/_partial/footer.html

@@ -23,7 +23,7 @@
                     <li><a href="https://www.reddit.com/r/AlmaLinux/">Reddit</a></li>
                     <li><a href="https://twitter.com/AlmaLinux">Twitter</a></li>
                     <li><a href="https://almalinux.discourse.group/">{% translate 'Forums' %}</a></li>
-                    <li><a href="https://chat.rockylinux.org">{% translate 'Chat' %}</a></li>
+                    <li><a href="https://chat.almalinux.org">{% translate 'Chat' %}</a></li>
                     <li><a href="ircs://irc.libera.chat:6697/almalinux">#almalinux IRC</a></li>
                 </ul>
             </div>