From 387b41be0f68862ff5af78d025a0b7511fb02ab8 Mon Sep 17 00:00:00 2001 From: Olivier Robert Date: Sun, 15 Jan 2023 13:47:10 +0700 Subject: [PATCH 1/5] Add archived version of the 2022 website (#263) --- .gitignore | 3 --- .gitmodules | 3 +++ src/_components/footer.liquid | 2 +- src/past/2022 | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) create mode 160000 src/past/2022 diff --git a/.gitignore b/.gitignore index 37d80057..0d224936 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,3 @@ yarn-debug.log* # Yarn Integrity file .yarn-integrity - -# Git Submodules -src/past diff --git a/.gitmodules b/.gitmodules index f041f1a7..1510941f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/past/2019"] path = src/past/2019 url = https://github.com/bangkokrb/rubyconfth-2019.git +[submodule "src/past/2022"] + path = src/past/2022 + url = https://github.com/bangkokrb/rubyconfth-2022.git diff --git a/src/_components/footer.liquid b/src/_components/footer.liquid index b273a78d..906bcf2b 100644 --- a/src/_components/footer.liquid +++ b/src/_components/footer.liquid @@ -23,7 +23,7 @@ Built with Ruby & Bridgetown diff --git a/src/past/2022 b/src/past/2022 new file mode 160000 index 00000000..f8fb8b5c --- /dev/null +++ b/src/past/2022 @@ -0,0 +1 @@ +Subproject commit f8fb8b5c2650d6fa1a53fd31f5701112d9bf4350 From c317d55c4b6e9e3a037bb5324441cacfdedee05d Mon Sep 17 00:00:00 2001 From: Matt Mayer Date: Sun, 15 Jan 2023 13:47:50 +0700 Subject: [PATCH 2/5] Add Youtube and Mastodon to social links (#264) --- src/_components/icon_sprite.liquid | 2 +- src/_components/list_social_platform.liquid | 2 +- src/_data/social_platforms.yml | 10 ++++++++-- src/images/shared/icons/mastodon.svg | 4 ++++ src/images/shared/icons/youtube.svg | 10 ++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/images/shared/icons/mastodon.svg create mode 100644 src/images/shared/icons/youtube.svg diff --git a/src/_components/icon_sprite.liquid b/src/_components/icon_sprite.liquid index 9b59a5f5..08c882d1 100644 --- a/src/_components/icon_sprite.liquid +++ b/src/_components/icon_sprite.liquid @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/_components/list_social_platform.liquid b/src/_components/list_social_platform.liquid index 411644a9..f9bef1f5 100644 --- a/src/_components/list_social_platform.liquid +++ b/src/_components/list_social_platform.liquid @@ -1,7 +1,7 @@