From d2e3d05cd192137f3ad34ef7afc73284d9884f54 Mon Sep 17 00:00:00 2001 From: Meng-Heng Date: Fri, 30 Aug 2024 13:35:27 +0700 Subject: [PATCH 1/3] Merge branch 'master' of https://github.com/Meng-Heng/keyman.com From 488a94e7d2b9cc743a7eaee45fa14581846b9bc5 Mon Sep 17 00:00:00 2001 From: Meng-Heng Date: Mon, 14 Oct 2024 11:00:51 +0700 Subject: [PATCH 2/3] Merge branch 'master' of https://github.com/Meng-Heng/keyman.com --- _includes/2020/templates/Foot.php | 4 ++-- about/index.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/2020/templates/Foot.php b/_includes/2020/templates/Foot.php index d5401952..1d616bce 100644 --- a/_includes/2020/templates/Foot.php +++ b/_includes/2020/templates/Foot.php @@ -3,7 +3,7 @@ namespace Keyman\Site\com\keyman\templates; - use Keyman\Site\com\keyman\Util; + use Keyman\Site\Common\ImageRandomizer; use Keyman\Site\com\keyman\KeymanVersion; use Keyman\Site\Common\KeymanHosts; @@ -59,7 +59,7 @@ static function render(array $fields = []) { diff --git a/about/index.md b/about/index.md index 86664655..08f514e7 100644 --- a/about/index.md +++ b/about/index.md @@ -14,7 +14,7 @@ Keyboard layouts are distributed through an open catalog to all major desktop an ## About SIL Global -![](/cdn/dev/img/sil-logo-blue-2017_1.png) +![](../_common/assets/sil-logos-2024/) Keyman is created by SIL Global (formerly SIL International). Partners in Language Development, SIL Global is a faith-based nonprofit organization committed to serving language communities From c9025e6c7fd80b2e5693c9796b750e9c3dd6475c Mon Sep 17 00:00:00 2001 From: Meng-Heng Date: Mon, 14 Oct 2024 15:05:02 +0700 Subject: [PATCH 3/3] fix: logo disappears from footer Fix: #479 --- keyboards/keyboard.php | 1 + search/index.php | 1 + 2 files changed, 2 insertions(+) diff --git a/keyboards/keyboard.php b/keyboards/keyboard.php index 3f12a5c3..a171e8e5 100644 --- a/keyboards/keyboard.php +++ b/keyboards/keyboard.php @@ -2,6 +2,7 @@ require_once('includes/template.php'); require_once('includes/ui/keyboard-details.php'); require_once('./session.php'); + require_once __DIR__ . '/../_includes/autoload.php'; if(isset($_REQUEST['legacy'])) { $id = find_id_by_legacy(clean_id($_REQUEST['legacy'])); diff --git a/search/index.php b/search/index.php index daacc856..1d515912 100644 --- a/search/index.php +++ b/search/index.php @@ -1,5 +1,6 @@ "Search Keyman Sites", 'css' => ['template.css'],