MaDgIK
/
eosc-explore
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[Library | develop & Eosc Explore | develop]: Added font-family "Inter" to align with Marketplace | Updated how back button "Go to search" is build - combine referrer and the new url parameter "pv", which is expected to have the previous url path and params. 

1. /assets: Added /media/fonts/inter folder with the "Inter" font-family.
2. eosc-custom.less: Override the default font family to use 'Inter', sans-serif.
3. routerHelper.class.ts: Added method "addQueryParam()" to add a query parameter in already existing or not object with parameters.
4. search-tab.component.ts & searchResult.component & projects-in-modal.component.ts & result/deletedByInference/deletedByInference.component.ts & organization/deletedByInference/deletedByInference.component.ts: Added @Input() prevPath: string = ""; and pass it to the appropriate children components.
5. result-preview.component & fundedBy.component.ts & availableOn.component.ts & relatedDatasourcesTab.component.ts: Added @Input() prevPath: string = ""; and method "addEoscPrevInParams()" and call it when building queryParams of internal links.
6. metrics.component.ts: Added @Input() prevPath: string = ""; and use it when building internal urls.
7. resultLanding.component.ts & project.component.ts & organization.component.ts & dataProvider.component.ts:
   a. Added fields public referrer: string; and public prevPath: string;
   b. Read "pv" url property and get referrer.
   c. Added methods "addEoscPrevInParams()" and "eoscBackLink()".
8. resultLanding.component.html & project.component.html & organization.component.html & dataProvider.component.html:
   a. Update "Go to Search" back link.
   b. Call "addEoscPrevInParams()" method when building queryParams of internal links.
   c. Pass "prevPath" to the appropriate children components.
This commit is contained in:
Konstantina Galouni 2023-04-20 20:06:53 +03:00
parent cd275865e5
commit 7b629ca7a8
15 changed files with 180 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 8789a0e5eead65d674aab9d535ec57e05ce303ca
Subproject commit f22a0bc8061125f6352b15efeb70e7c43a001310

13
src/assets/eosc-custom.less
View File

@ -34,6 +34,19 @@
// background-color: rgba(61,77, 182);
//}
@font-url: e("/assets/media/fonts/inter/static/");
/* Inter */
@font-face { font-family: "inter"; font-style: normal; font-weight: 100; src: url("@{font-url}Inter-Thin-thin.ttf") format('truetype'); font-display: swap}
@font-face { font-family: "inter"; font-style: normal; font-weight: 300; src: url("@{font-url}Inter-Light.ttf") format('truetype'); font-display: swap}
@font-face { font-family: "inter"; font-style: normal; font-weight: 400; src: url("@{font-url}Inter-Regular.ttf") format('truetype'); font-display: swap}
@font-face { font-family: "inter"; font-style: normal; font-weight: 600; src: url("@{font-url}Inter-SemiBold.ttf") format('truetype'); font-display: swap}
@font-face { font-family: "inter"; font-style: normal; font-weight: 700; src: url("@{font-url}Inter-Bold.ttf") format('truetype'); font-display: swap}
@font-face { font-family: "inter"; font-style: normal; font-weight: 900; src: url("@{font-url}Inter-Black.ttf") format('truetype'); font-display: swap}
@global-font-family: 'Inter', sans-serif;
@eosc-color: #010F87;
@eosc-light-color: #3D4DB6;

BIN
src/assets/media/fonts/inter/Inter-VariableFont_slnt,wght.ttf Normal file
View File

Binary file not shown.

93
src/assets/media/fonts/inter/OFL.txt Normal file
View File

@ -0,0 +1,93 @@
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

72
src/assets/media/fonts/inter/README.txt Normal file
View File

@ -0,0 +1,72 @@
Inter Variable Font
===================
This download contains Inter as both a variable font and static fonts.
Inter is a variable font with these axes:
slnt
wght
This means all the styles are contained in a single file:
Inter-VariableFont_slnt,wght.ttf
If your app fully supports variable fonts, you can now pick intermediate styles
that aren’t available as static fonts. Not all apps support variable fonts, and
in those cases you can use the static font files for Inter:
static/Inter-Thin.ttf
static/Inter-ExtraLight.ttf
static/Inter-Light.ttf
static/Inter-Regular.ttf
static/Inter-Medium.ttf
static/Inter-SemiBold.ttf
static/Inter-Bold.ttf
static/Inter-ExtraBold.ttf
static/Inter-Black.ttf
Get started
-----------
1. Install the font files you want to use
2. Use your app's font picker to view the font family and all the
available styles
Learn more about variable fonts
-------------------------------
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
https://variablefonts.typenetwork.com
https://medium.com/variable-fonts
In desktop apps
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
Online
https://developers.google.com/fonts/docs/getting_started
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
Installing fonts
MacOS: https://support.apple.com/en-us/HT201749
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
Android Apps
https://developers.google.com/fonts/docs/android
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
License
-------
Please read the full license text (OFL.txt) to understand the permissions,
restrictions and requirements for usage, redistribution, and modification.
You can use them in your products & projects – print or digital,
commercial or otherwise.
This isn't legal advice, please consider consulting a lawyer and see the full
license for all details.

BIN
src/assets/media/fonts/inter/static/Inter-Black.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-Bold.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-ExtraBold.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-ExtraLight.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-Light.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-Medium.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-Regular.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-SemiBold.ttf Normal file
View File

Binary file not shown.

BIN
src/assets/media/fonts/inter/static/Inter-Thin.ttf Normal file
View File

Binary file not shown.

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit f264617e5ab356c4279ee1ef1819db434fec4fba
Subproject commit aa1e6c9df390a4ba0919b5f8591374f7eec75089