Merge branch 'master' of https://github.com/gregpr07/x5gon-gatsby

X5GON · Sep 18, 2020 · 9d3db20 · 9d3db20
2 parents eb5f0fe + f2f2d1d
commit 9d3db20
Show file tree

Hide file tree

Showing 34 changed files with 1,949 additions and 1,465 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            cd ../../x5gon/x5gon-platform/src/services/platform/frontend
+            cd ../../x5gon/x5gon-platform/platform/frontend
             git pull
             npm install
             npm run-script build
diff --git a/src/images/header_image.png b/src/images/header_image.png
diff --git a/src/images/policy_header.jpg b/src/images/policy_header.jpg
diff --git a/src/images/policy_landing.jpg b/src/images/policy_landing.jpg
diff --git a/src/images/unesco-bg.jpeg b/src/images/unesco-bg.jpeg
diff --git a/src/images/xl_minus_icon.svg b/src/images/xl_minus_icon.svg
diff --git a/src/images/xl_minus_icon_blue.svg b/src/images/xl_minus_icon_blue.svg
diff --git a/src/images/xl_plus_icon.svg b/src/images/xl_plus_icon.svg
diff --git a/src/images/xl_plus_icon_blue.svg b/src/images/xl_plus_icon_blue.svg
diff --git a/src/pages/products/feed.js b/src/pages/products/feed.js
diff --git a/static/imgs/euflag.png b/static/imgs/euflag.png
diff --git a/static/imgs/logo/x5gon_logo_dark.svg b/static/imgs/logo/x5gon_logo_dark.svg
diff --git a/static/imgs/logo/x5gon_logo_light.svg b/static/imgs/logo/x5gon_logo_light.svg
diff --git a/static/imgs/partners/IJS_logo copy.png b/static/imgs/partners/IJS_logo copy.png
diff --git a/static/imgs/partners/K4A_logo copy.png b/static/imgs/partners/K4A_logo copy.png
diff --git a/static/imgs/partners/MIZS_logo copy.png b/static/imgs/partners/MIZS_logo copy.png
diff --git a/static/imgs/partners/UCL_logo copy.png b/static/imgs/partners/UCL_logo copy.png
diff --git a/static/imgs/partners/UDN_logo copy.png b/static/imgs/partners/UDN_logo copy.png
diff --git a/static/imgs/partners/UO_logo copy.png b/static/imgs/partners/UO_logo copy.png
diff --git a/static/imgs/partners/UPV_logo copy.png b/static/imgs/partners/UPV_logo copy.png
diff --git a/static/imgs/partners/posta_slo_logo copy.png b/static/imgs/partners/posta_slo_logo copy.png
diff --git a/static/imgs/svgs/ArrowDown.svg b/static/imgs/svgs/ArrowDown.svg
diff --git a/static/imgs/svgs/Loading.svg b/static/imgs/svgs/Loading.svg
diff --git a/static/imgs/team/Mihajela.png b/static/imgs/team/Mihajela.png
diff --git a/static/imgs/team/colin.jpg b/static/imgs/team/colin.jpg
diff --git a/static/imgs/team/davor.jpg b/static/imgs/team/davor.jpg
diff --git a/static/imgs/team/erik.jpg b/static/imgs/team/erik.jpg
diff --git a/static/imgs/team/feyenflorian.png b/static/imgs/team/feyenflorian.png
diff --git a/static/imgs/team/john.jpg b/static/imgs/team/john.jpg
diff --git a/static/imgs/team/maria.png b/static/imgs/team/maria.png
diff --git a/static/imgs/team/martin_molan.png b/static/imgs/team/martin_molan.png
diff --git a/static/imgs/team/mitja.jpg b/static/imgs/team/mitja.jpg
diff --git a/static/imgs/team/rrolf.png b/static/imgs/team/rrolf.png
diff --git a/static/imgs/team/sahan.png b/static/imgs/team/sahan.png