diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 17abb400..0fac80e9 100644 --- a/explore/src/app/funders/funders.component.html +++ b/explore/src/app/funders/funders.component.html @@ -62,7 +62,7 @@
- +
diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index 5a68cedb..29a587cd 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -182,7 +182,7 @@ export class FundersComponent implements OnInit { if(!funder.logoUrl && this.staticLogos.has(funder.id)) { let split = funder.id.split("||"); let shortname = (split && split.length==3) ? funder.id.split("||")[2] : funder.id; - funder.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".webp"; + funder.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png"; } this.fundersMap.set(queriedFunder.id, funder); diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index 992a87fb..cdb91938 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -65,7 +65,7 @@
- researchers + researchers search
@@ -155,20 +155,20 @@ - ipad - Deposit search + Deposit search - Deposit in OpenAIRE or Zenodo + Deposit in OpenAIRE or Zenodo - Search links + Search links - link + link diff --git a/explore/src/app/home/home.component.ts b/explore/src/app/home/home.component.ts index 427b38d0..be441449 100644 --- a/explore/src/app/home/home.component.ts +++ b/explore/src/app/home/home.component.ts @@ -36,30 +36,30 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit { public logos = { "publication": [ [ - "publications.webp" + "publications.png" ], [ - "publications2.webp" + "publications2.png" ] ], "software": [ [ - "software.webp" + "software.png" ] ], "dataset": [ [ - "datasets.webp" + "datasets.png" ] ], "persistent": [ [ - "pids.webp" + "pids.png" ] ], "funder": [ [ - "funders.webp" + "funders.png" ] ] }; diff --git a/explore/src/assets/ExploreLogos/datasets.png b/explore/src/assets/ExploreLogos/datasets.png new file mode 100644 index 00000000..bfe7b3fb Binary files /dev/null and b/explore/src/assets/ExploreLogos/datasets.png differ diff --git a/explore/src/assets/ExploreLogos/datasets.webp b/explore/src/assets/ExploreLogos/datasets.webp deleted file mode 100644 index fdb01f16..00000000 Binary files a/explore/src/assets/ExploreLogos/datasets.webp and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/funders.png b/explore/src/assets/ExploreLogos/funders.png new file mode 100644 index 00000000..e06fb016 Binary files /dev/null and b/explore/src/assets/ExploreLogos/funders.png differ diff --git a/explore/src/assets/ExploreLogos/funders.webp b/explore/src/assets/ExploreLogos/funders.webp deleted file mode 100644 index 38ccec59..00000000 Binary files a/explore/src/assets/ExploreLogos/funders.webp and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/pids.png b/explore/src/assets/ExploreLogos/pids.png new file mode 100644 index 00000000..c4248c2d Binary files /dev/null and b/explore/src/assets/ExploreLogos/pids.png differ diff --git a/explore/src/assets/ExploreLogos/pids.webp b/explore/src/assets/ExploreLogos/pids.webp deleted file mode 100644 index d62b6aa6..00000000 Binary files a/explore/src/assets/ExploreLogos/pids.webp and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/publications.png b/explore/src/assets/ExploreLogos/publications.png new file mode 100644 index 00000000..22de1a12 Binary files /dev/null and b/explore/src/assets/ExploreLogos/publications.png differ diff --git a/explore/src/assets/ExploreLogos/publications.webp b/explore/src/assets/ExploreLogos/publications.webp deleted file mode 100644 index 28cfc11d..00000000 Binary files a/explore/src/assets/ExploreLogos/publications.webp and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/publications2.png b/explore/src/assets/ExploreLogos/publications2.png new file mode 100644 index 00000000..d889d5cc Binary files /dev/null and b/explore/src/assets/ExploreLogos/publications2.png differ diff --git a/explore/src/assets/ExploreLogos/publications2.webp b/explore/src/assets/ExploreLogos/publications2.webp deleted file mode 100644 index c37322b5..00000000 Binary files a/explore/src/assets/ExploreLogos/publications2.webp and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/software.png b/explore/src/assets/ExploreLogos/software.png new file mode 100644 index 00000000..2bcac348 Binary files /dev/null and b/explore/src/assets/ExploreLogos/software.png differ diff --git a/explore/src/assets/ExploreLogos/software.webp b/explore/src/assets/ExploreLogos/software.webp deleted file mode 100644 index a9a2d4ba..00000000 Binary files a/explore/src/assets/ExploreLogos/software.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/funders.webp b/explore/src/assets/explore-assets/funders/funders.webp deleted file mode 100644 index 410e58b8..00000000 Binary files a/explore/src/assets/explore-assets/funders/funders.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/ARC.png b/explore/src/assets/explore-assets/funders/logos/ARC.png new file mode 100644 index 00000000..3b46f9bb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/ARC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/ARC.webp b/explore/src/assets/explore-assets/funders/logos/ARC.webp deleted file mode 100644 index 4b8e6523..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/ARC.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/ASAP.png b/explore/src/assets/explore-assets/funders/logos/ASAP.png new file mode 100644 index 00000000..96ccfd25 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/ASAP.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/ASAP.webp b/explore/src/assets/explore-assets/funders/logos/ASAP.webp deleted file mode 100644 index 1089258b..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/ASAP.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/CIHR.png b/explore/src/assets/explore-assets/funders/logos/CIHR.png new file mode 100644 index 00000000..ad3b65fb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/CIHR.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/CIHR.webp b/explore/src/assets/explore-assets/funders/logos/CIHR.webp deleted file mode 100644 index f995ada4..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/CIHR.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/EEA.png b/explore/src/assets/explore-assets/funders/logos/EEA.png new file mode 100644 index 00000000..e2c9d290 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/EEA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/EEA.webp b/explore/src/assets/explore-assets/funders/logos/EEA.webp deleted file mode 100644 index 46b121a5..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/EEA.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/INCa.png b/explore/src/assets/explore-assets/funders/logos/INCa.png new file mode 100644 index 00000000..8ca6f31a Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/INCa.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/INCa.webp b/explore/src/assets/explore-assets/funders/logos/INCa.webp deleted file mode 100644 index 4fac7c6d..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/INCa.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NHMRC.png b/explore/src/assets/explore-assets/funders/logos/NHMRC.png new file mode 100644 index 00000000..12177452 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NHMRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NHMRC.webp b/explore/src/assets/explore-assets/funders/logos/NHMRC.webp deleted file mode 100644 index 8c2bcbeb..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NHMRC.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NIH.png b/explore/src/assets/explore-assets/funders/logos/NIH.png new file mode 100644 index 00000000..be2451af Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NIH.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NIH.webp b/explore/src/assets/explore-assets/funders/logos/NIH.webp deleted file mode 100644 index 6c33e0fb..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NIH.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSERC.png b/explore/src/assets/explore-assets/funders/logos/NSERC.png new file mode 100644 index 00000000..fddb3ac8 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NSERC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSERC.webp b/explore/src/assets/explore-assets/funders/logos/NSERC.webp deleted file mode 100644 index 37b817e3..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NSERC.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSF.png b/explore/src/assets/explore-assets/funders/logos/NSF.png new file mode 100644 index 00000000..ac7704db Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NSF.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSF.webp b/explore/src/assets/explore-assets/funders/logos/NSF.webp deleted file mode 100644 index 27bc9069..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NSF.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/SSHRC.png b/explore/src/assets/explore-assets/funders/logos/SSHRC.png new file mode 100644 index 00000000..6b3c52ce Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/SSHRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/SSHRC.webp b/explore/src/assets/explore-assets/funders/logos/SSHRC.webp deleted file mode 100644 index 9ede7100..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/SSHRC.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/TARA.png b/explore/src/assets/explore-assets/funders/logos/TARA.png new file mode 100644 index 00000000..fe3336b5 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/TARA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/TARA.webp b/explore/src/assets/explore-assets/funders/logos/TARA.webp deleted file mode 100644 index 50fbd7b5..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/TARA.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/UKRI.png b/explore/src/assets/explore-assets/funders/logos/UKRI.png new file mode 100644 index 00000000..9d9b596f Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/UKRI.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/UKRI.webp b/explore/src/assets/explore-assets/funders/logos/UKRI.webp deleted file mode 100644 index 098e4b6a..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/UKRI.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/WT.png b/explore/src/assets/explore-assets/funders/logos/WT.png new file mode 100644 index 00000000..52149df8 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/WT.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/WT.webp b/explore/src/assets/explore-assets/funders/logos/WT.webp deleted file mode 100644 index a9387c26..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/WT.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/1.png b/explore/src/assets/explore-assets/home/1.png new file mode 100644 index 00000000..12ca2ce8 Binary files /dev/null and b/explore/src/assets/explore-assets/home/1.png differ diff --git a/explore/src/assets/explore-assets/home/1.webp b/explore/src/assets/explore-assets/home/1.webp deleted file mode 100644 index dfce8a6c..00000000 Binary files a/explore/src/assets/explore-assets/home/1.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/2.png b/explore/src/assets/explore-assets/home/2.png new file mode 100644 index 00000000..7b5e06e7 Binary files /dev/null and b/explore/src/assets/explore-assets/home/2.png differ diff --git a/explore/src/assets/explore-assets/home/2.webp b/explore/src/assets/explore-assets/home/2.webp deleted file mode 100644 index 71bd0bda..00000000 Binary files a/explore/src/assets/explore-assets/home/2.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/3.png b/explore/src/assets/explore-assets/home/3.png new file mode 100644 index 00000000..bbbc0fb9 Binary files /dev/null and b/explore/src/assets/explore-assets/home/3.png differ diff --git a/explore/src/assets/explore-assets/home/3.webp b/explore/src/assets/explore-assets/home/3.webp deleted file mode 100644 index be9ffe08..00000000 Binary files a/explore/src/assets/explore-assets/home/3.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/4.png b/explore/src/assets/explore-assets/home/4.png new file mode 100644 index 00000000..22c3a9b5 Binary files /dev/null and b/explore/src/assets/explore-assets/home/4.png differ diff --git a/explore/src/assets/explore-assets/home/4.webp b/explore/src/assets/explore-assets/home/4.webp deleted file mode 100644 index 9acc1c08..00000000 Binary files a/explore/src/assets/explore-assets/home/4.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/explore.jpg b/explore/src/assets/explore-assets/home/explore.jpg new file mode 100644 index 00000000..9291f895 Binary files /dev/null and b/explore/src/assets/explore-assets/home/explore.jpg differ diff --git a/explore/src/assets/explore-assets/home/explore.webp b/explore/src/assets/explore-assets/home/explore.webp deleted file mode 100644 index 9d524d00..00000000 Binary files a/explore/src/assets/explore-assets/home/explore.webp and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/tablet.png b/explore/src/assets/explore-assets/home/tablet.png new file mode 100644 index 00000000..37826a4a Binary files /dev/null and b/explore/src/assets/explore-assets/home/tablet.png differ diff --git a/explore/src/assets/explore-assets/home/tablet.webp b/explore/src/assets/explore-assets/home/tablet.webp deleted file mode 100644 index 508ba618..00000000 Binary files a/explore/src/assets/explore-assets/home/tablet.webp and /dev/null differ