Merge remote-tracking branch 'upstream/pull/4308'

diff --git a/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg b/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg
new file mode 100644 (file)
index 0000000..f4a498c
Binary files /dev/null and b/app/assets/images/banners/SOTMAsia_x_FOSS4G_2023.jpg differ

diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg
new file mode 100644 (file)
index 0000000..b2bf062
Binary files /dev/null and b/app/assets/images/banners/StateOfTheMapAfrica_2023.jpg differ

diff --git a/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg b/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg
new file mode 100644 (file)
index 0000000..d7d362a
Binary files /dev/null and b/app/assets/images/banners/StateOfTheMapAfrica_2023@2x.jpg differ

diff --git a/config/banners.yml b/config/banners.yml
index 23256643d67965a158fccaf85bb24b2abbfc7bc1..0f119e0478bbb8e3d10d1ded222deb46be042a89 100644 (file)
--- a/config/banners.yml
+++ b/config/banners.yml
@@ -15,3 +15,20 @@ sotmeu_2023:
   img: banners/StateoftheMapEurope_2023.png
   startdate: 2023-oct-05
   enddate: 2023-nov-05
+sotmasia_2023:
+  id: sotmasia_2023
+  alt: State of the Map Asia x Foss4G Thailand 2023
+  link: https://stateofthemap.asia/
+  img: banners/SOTMAsia_x_FOSS4G_2023.jpg
+  startdate: 2023-oct-18
+  enddate: 2023-nov-18
+sotmafrica_2023:
+  id: sotmafrica_2023
+  alt: State of the Map Africa 2023
+  link: https://stateofthemap.asia/
+  img: banners/StateOfTheMapAfrica_2023.jpg
+  srcset:
+    - [banners/StateOfTheMapAfrica_2023.jpg, 1x]
+    - [banners/StateOfTheMapAfrica_2023@2x.jpg, 2x]
+  startdate: 2023-oct-30
+  enddate: 2023-nov-30
\ No newline at end of file