diff --git a/explore/src/app/funders/funders.component.html b/explore/src/app/funders/funders.component.html index 0fac80e9..17abb400 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 29a587cd..5a68cedb 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+".png"; + funder.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".webp"; } 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 cdb91938..992a87fb 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 8749c77b..427b38d0 100644 --- a/explore/src/app/home/home.component.ts +++ b/explore/src/app/home/home.component.ts @@ -36,85 +36,30 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit { public logos = { "publication": [ [ - // "logo-pubmed.png", - // "logo-arxiv.png", - // "logo-base.png", - // "logo-scielo.png", - // "logo-la-referencia.png", - // "logo-soar.png", - // "logo-repec.png", - // "logo-core.png", - // "logo-zenodo.png", - // "logo-narcis.png" - "publications.png" + "publications.webp" ], [ - // "logo-unpaywall.png", - // "logo-elsevier.png", - // "logo-spring-nature.png", - // "logo-frontiers.png", - // "logo-opencitations.png", - // "logo-doaj.png", - // "logo-microsoft.png", - // "logo-plos.png", - // "logo-f1000.png", - // "logo-copernicus.png" - "publications2.png" + "publications2.webp" ] ], "software": [ [ - // "logo-software-heritage.png", - // "logo-github.png", - // "logo-doecode.png", - // "logo-bitbucket.png", - // "logo-elixir-bio-tools.png", - // "logo-google-code.png", - // "logo-sourceforge.png", - // "logo-zenodo.png" - "software.png" + "software.webp" ] ], "dataset": [ [ - // "logo-scholexplorer.png", - // "logo-zenodo.png", - // "logo-pangea.png", - // "logo-figshare.png", - // "logo-protocols.png", - // "logo-opentrials.png", - // "logo-kaggle.png", - // "logo-reactome.png", - // "logo-easy.png", - // "logo-dryad.png" - "datasets.png" + "datasets.webp" ] ], "persistent": [ [ - // "logo-re3data.png", - // "logo-orcid.png", - // "logo-opendoar.png", - // "logo-grid.png", - // "logo-fairsharing.png", - // "logo-ror.png", - // "logo-datacite.png", - // "logo-crossref.png" - "pids.png" + "pids.webp" ] ], "funder": [ [ - // "logo-european-commision.png", - // "logo-nsf.png", - // "logo-nhmrc.png", - // "logo-sfi.png", - // "logo-nwo.png", - // "logo-welcome-trust.png", - // "logo-fct.png", - // "logo-gsrt.png", - // "logo-fnsnf.png" - "funders.png" + "funders.webp" ] ] }; diff --git a/explore/src/assets/ExploreLogos/datasets.png b/explore/src/assets/ExploreLogos/datasets.png deleted file mode 100644 index bfe7b3fb..00000000 Binary files a/explore/src/assets/ExploreLogos/datasets.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/datasets.webp b/explore/src/assets/ExploreLogos/datasets.webp new file mode 100644 index 00000000..fdb01f16 Binary files /dev/null and b/explore/src/assets/ExploreLogos/datasets.webp differ diff --git a/explore/src/assets/ExploreLogos/funders.png b/explore/src/assets/ExploreLogos/funders.png deleted file mode 100644 index e06fb016..00000000 Binary files a/explore/src/assets/ExploreLogos/funders.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/funders.webp b/explore/src/assets/ExploreLogos/funders.webp new file mode 100644 index 00000000..38ccec59 Binary files /dev/null and b/explore/src/assets/ExploreLogos/funders.webp differ diff --git a/explore/src/assets/ExploreLogos/pids.png b/explore/src/assets/ExploreLogos/pids.png deleted file mode 100644 index c4248c2d..00000000 Binary files a/explore/src/assets/ExploreLogos/pids.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/pids.webp b/explore/src/assets/ExploreLogos/pids.webp new file mode 100644 index 00000000..d62b6aa6 Binary files /dev/null and b/explore/src/assets/ExploreLogos/pids.webp differ diff --git a/explore/src/assets/ExploreLogos/publications.png b/explore/src/assets/ExploreLogos/publications.png deleted file mode 100644 index 22de1a12..00000000 Binary files a/explore/src/assets/ExploreLogos/publications.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/publications.webp b/explore/src/assets/ExploreLogos/publications.webp new file mode 100644 index 00000000..28cfc11d Binary files /dev/null and b/explore/src/assets/ExploreLogos/publications.webp differ diff --git a/explore/src/assets/ExploreLogos/publications2.png b/explore/src/assets/ExploreLogos/publications2.png deleted file mode 100644 index d889d5cc..00000000 Binary files a/explore/src/assets/ExploreLogos/publications2.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/publications2.webp b/explore/src/assets/ExploreLogos/publications2.webp new file mode 100644 index 00000000..c37322b5 Binary files /dev/null and b/explore/src/assets/ExploreLogos/publications2.webp differ diff --git a/explore/src/assets/ExploreLogos/software.png b/explore/src/assets/ExploreLogos/software.png deleted file mode 100644 index 2bcac348..00000000 Binary files a/explore/src/assets/ExploreLogos/software.png and /dev/null differ diff --git a/explore/src/assets/ExploreLogos/software.webp b/explore/src/assets/ExploreLogos/software.webp new file mode 100644 index 00000000..a9a2d4ba Binary files /dev/null and b/explore/src/assets/ExploreLogos/software.webp differ diff --git a/explore/src/assets/ask-explore.svg b/explore/src/assets/ask-explore.svg deleted file mode 100644 index c1a04931..00000000 --- a/explore/src/assets/ask-explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/curved-bottom.svg b/explore/src/assets/curved-bottom.svg deleted file mode 100644 index b4742be8..00000000 --- a/explore/src/assets/curved-bottom.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/explore/src/assets/explore-assets/funders/funders.webp b/explore/src/assets/explore-assets/funders/funders.webp new file mode 100644 index 00000000..410e58b8 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/funders.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/ARC.png b/explore/src/assets/explore-assets/funders/logos/ARC.png deleted file mode 100644 index 3b46f9bb..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/ARC.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/ARC.webp b/explore/src/assets/explore-assets/funders/logos/ARC.webp new file mode 100644 index 00000000..4b8e6523 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/ARC.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/ASAP.png b/explore/src/assets/explore-assets/funders/logos/ASAP.png deleted file mode 100644 index 96ccfd25..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/ASAP.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/ASAP.webp b/explore/src/assets/explore-assets/funders/logos/ASAP.webp new file mode 100644 index 00000000..1089258b Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/ASAP.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/CIHR.png b/explore/src/assets/explore-assets/funders/logos/CIHR.png deleted file mode 100644 index ad3b65fb..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/CIHR.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/CIHR.webp b/explore/src/assets/explore-assets/funders/logos/CIHR.webp new file mode 100644 index 00000000..f995ada4 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/CIHR.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/EEA.png b/explore/src/assets/explore-assets/funders/logos/EEA.png deleted file mode 100644 index e2c9d290..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/EEA.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/EEA.webp b/explore/src/assets/explore-assets/funders/logos/EEA.webp new file mode 100644 index 00000000..46b121a5 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/EEA.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/INCa.png b/explore/src/assets/explore-assets/funders/logos/INCa.png deleted file mode 100644 index 8ca6f31a..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/INCa.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/INCa.webp b/explore/src/assets/explore-assets/funders/logos/INCa.webp new file mode 100644 index 00000000..4fac7c6d Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/INCa.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/NHMRC.png b/explore/src/assets/explore-assets/funders/logos/NHMRC.png deleted file mode 100644 index 12177452..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NHMRC.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NHMRC.webp b/explore/src/assets/explore-assets/funders/logos/NHMRC.webp new file mode 100644 index 00000000..8c2bcbeb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NHMRC.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/NIH.png b/explore/src/assets/explore-assets/funders/logos/NIH.png deleted file mode 100644 index be2451af..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NIH.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NIH.webp b/explore/src/assets/explore-assets/funders/logos/NIH.webp new file mode 100644 index 00000000..6c33e0fb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NIH.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSERC.png b/explore/src/assets/explore-assets/funders/logos/NSERC.png deleted file mode 100644 index fddb3ac8..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NSERC.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSERC.webp b/explore/src/assets/explore-assets/funders/logos/NSERC.webp new file mode 100644 index 00000000..37b817e3 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NSERC.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSF.png b/explore/src/assets/explore-assets/funders/logos/NSF.png deleted file mode 100644 index ac7704db..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/NSF.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/NSF.webp b/explore/src/assets/explore-assets/funders/logos/NSF.webp new file mode 100644 index 00000000..27bc9069 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/NSF.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/SSHRC.png b/explore/src/assets/explore-assets/funders/logos/SSHRC.png deleted file mode 100644 index 6b3c52ce..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/SSHRC.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/SSHRC.webp b/explore/src/assets/explore-assets/funders/logos/SSHRC.webp new file mode 100644 index 00000000..9ede7100 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/SSHRC.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/TARA.png b/explore/src/assets/explore-assets/funders/logos/TARA.png deleted file mode 100644 index fe3336b5..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/TARA.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/TARA.webp b/explore/src/assets/explore-assets/funders/logos/TARA.webp new file mode 100644 index 00000000..50fbd7b5 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/TARA.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/UKRI.png b/explore/src/assets/explore-assets/funders/logos/UKRI.png deleted file mode 100644 index 9d9b596f..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/UKRI.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/UKRI.webp b/explore/src/assets/explore-assets/funders/logos/UKRI.webp new file mode 100644 index 00000000..098e4b6a Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/UKRI.webp differ diff --git a/explore/src/assets/explore-assets/funders/logos/WT.png b/explore/src/assets/explore-assets/funders/logos/WT.png deleted file mode 100644 index 52149df8..00000000 Binary files a/explore/src/assets/explore-assets/funders/logos/WT.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/funders/logos/WT.webp b/explore/src/assets/explore-assets/funders/logos/WT.webp new file mode 100644 index 00000000..a9387c26 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/WT.webp differ diff --git a/explore/src/assets/explore-assets/graph.png b/explore/src/assets/explore-assets/graph.png deleted file mode 100644 index d49ce712..00000000 Binary files a/explore/src/assets/explore-assets/graph.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/1.png b/explore/src/assets/explore-assets/home/1.png deleted file mode 100644 index 12ca2ce8..00000000 Binary files a/explore/src/assets/explore-assets/home/1.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/1.webp b/explore/src/assets/explore-assets/home/1.webp new file mode 100644 index 00000000..dfce8a6c Binary files /dev/null and b/explore/src/assets/explore-assets/home/1.webp differ diff --git a/explore/src/assets/explore-assets/home/2.png b/explore/src/assets/explore-assets/home/2.png deleted file mode 100644 index 7b5e06e7..00000000 Binary files a/explore/src/assets/explore-assets/home/2.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/2.webp b/explore/src/assets/explore-assets/home/2.webp new file mode 100644 index 00000000..71bd0bda Binary files /dev/null and b/explore/src/assets/explore-assets/home/2.webp differ diff --git a/explore/src/assets/explore-assets/home/3.png b/explore/src/assets/explore-assets/home/3.png deleted file mode 100644 index bbbc0fb9..00000000 Binary files a/explore/src/assets/explore-assets/home/3.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/3.webp b/explore/src/assets/explore-assets/home/3.webp new file mode 100644 index 00000000..be9ffe08 Binary files /dev/null and b/explore/src/assets/explore-assets/home/3.webp differ diff --git a/explore/src/assets/explore-assets/home/4.png b/explore/src/assets/explore-assets/home/4.png deleted file mode 100644 index 22c3a9b5..00000000 Binary files a/explore/src/assets/explore-assets/home/4.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/4.webp b/explore/src/assets/explore-assets/home/4.webp new file mode 100644 index 00000000..9acc1c08 Binary files /dev/null and b/explore/src/assets/explore-assets/home/4.webp differ diff --git a/explore/src/assets/explore-assets/home/explore.jpg b/explore/src/assets/explore-assets/home/explore.jpg deleted file mode 100644 index 9291f895..00000000 Binary files a/explore/src/assets/explore-assets/home/explore.jpg and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/explore.webp b/explore/src/assets/explore-assets/home/explore.webp new file mode 100644 index 00000000..9d524d00 Binary files /dev/null and b/explore/src/assets/explore-assets/home/explore.webp differ diff --git a/explore/src/assets/explore-assets/home/tablet.png b/explore/src/assets/explore-assets/home/tablet.png deleted file mode 100644 index 37826a4a..00000000 Binary files a/explore/src/assets/explore-assets/home/tablet.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/home/tablet.webp b/explore/src/assets/explore-assets/home/tablet.webp new file mode 100644 index 00000000..508ba618 Binary files /dev/null and b/explore/src/assets/explore-assets/home/tablet.webp differ diff --git a/explore/src/assets/explore-assets/trello-2.svg b/explore/src/assets/explore-assets/trello-2.svg deleted file mode 100644 index 6a5e682a..00000000 --- a/explore/src/assets/explore-assets/trello-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-assets/trello-sc.png b/explore/src/assets/explore-assets/trello-sc.png deleted file mode 100644 index d4330f7d..00000000 Binary files a/explore/src/assets/explore-assets/trello-sc.png and /dev/null differ diff --git a/explore/src/assets/explore-assets/trello.svg b/explore/src/assets/explore-assets/trello.svg deleted file mode 100644 index cf47fb37..00000000 --- a/explore/src/assets/explore-assets/trello.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/explore-banner.png b/explore/src/assets/explore-banner.png deleted file mode 100644 index 6fd5da96..00000000 Binary files a/explore/src/assets/explore-banner.png and /dev/null differ diff --git a/explore/src/assets/explore.svg b/explore/src/assets/explore.svg deleted file mode 100644 index c41bb4d3..00000000 --- a/explore/src/assets/explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/home.jpg b/explore/src/assets/home.jpg deleted file mode 100644 index b0fae781..00000000 Binary files a/explore/src/assets/home.jpg and /dev/null differ diff --git a/explore/src/assets/link.svg b/explore/src/assets/link.svg deleted file mode 100644 index d8e54c36..00000000 --- a/explore/src/assets/link.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 82 \ No newline at end of file diff --git a/explore/src/assets/lock.svg b/explore/src/assets/lock.svg deleted file mode 100644 index 3e7671d8..00000000 --- a/explore/src/assets/lock.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/explore/src/assets/logo-large-explore.png b/explore/src/assets/logo-large-explore.png deleted file mode 100644 index d225e6f4..00000000 Binary files a/explore/src/assets/logo-large-explore.png and /dev/null differ diff --git a/explore/src/assets/logo-large-explore.webp b/explore/src/assets/logo-large-explore.webp new file mode 100644 index 00000000..827cd218 Binary files /dev/null and b/explore/src/assets/logo-large-explore.webp differ diff --git a/explore/src/assets/logo-small-explore.png b/explore/src/assets/logo-small-explore.png deleted file mode 100644 index 20a16039..00000000 Binary files a/explore/src/assets/logo-small-explore.png and /dev/null differ diff --git a/explore/src/assets/logo-small-explore.webp b/explore/src/assets/logo-small-explore.webp new file mode 100644 index 00000000..a7ef0782 Binary files /dev/null and b/explore/src/assets/logo-small-explore.webp differ diff --git a/explore/src/assets/share.svg b/explore/src/assets/share.svg deleted file mode 100644 index f6c165b8..00000000 --- a/explore/src/assets/share.svg +++ /dev/null @@ -1 +0,0 @@ -Asset 83 \ No newline at end of file diff --git a/explore/src/assets/sky_bw3.png b/explore/src/assets/sky_bw3.png deleted file mode 100644 index efff4140..00000000 Binary files a/explore/src/assets/sky_bw3.png and /dev/null differ diff --git a/explore/src/assets/trello-2.svg b/explore/src/assets/trello-2.svg deleted file mode 100644 index 6a5e682a..00000000 --- a/explore/src/assets/trello-2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/trello-sc.png b/explore/src/assets/trello-sc.png deleted file mode 100644 index d4330f7d..00000000 Binary files a/explore/src/assets/trello-sc.png and /dev/null differ diff --git a/explore/src/assets/trello.svg b/explore/src/assets/trello.svg deleted file mode 100644 index cf47fb37..00000000 --- a/explore/src/assets/trello.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/explore/src/assets/Εxplore-sub.jpg b/explore/src/assets/Εxplore-sub.jpg deleted file mode 100644 index 78d4e8d9..00000000 Binary files a/explore/src/assets/Εxplore-sub.jpg and /dev/null differ