From: Tom Hughes Date: Fri, 27 Oct 2023 13:26:54 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4308' X-Git-Tag: live~1219 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/f00a12a2ec91e67485810d9fb3a31203b1d40123?hp=b89fd03403455e9bd991bc40b2be087e2f28953c 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 index 000000000..f4a498c1c 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 index 000000000..b2bf06209 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 index 000000000..d7d362ae7 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 23256643d..0f119e047 100644 --- 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