Merging from master

This commit is contained in:
Konstantina Galouni 2022-09-30 15:37:27 +03:00
commit e9014daae6
11 changed files with 37 additions and 13 deletions

11
CHANGELOG.md Normal file
View File

@ -0,0 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.
## [1.0.0]
Initial release of EOSC Explore Portal.
It contists of the search pages and the landing pages for the content of the BETA OpenAIRE Graph.
For datasets there is the demo funtionality of Datatransfer service, using zenodo as source and EDI demo dcache as destination.
There is link to EOSC market place (beta) for results connected to EOSC services.

View File

@ -44,7 +44,7 @@
"src/robots.txt"
],
"styles": [
"src/styles.css",
"src/styles.less",
"src/assets/common-assets/library-css/material.scss"
],
"scripts": [
@ -184,7 +184,7 @@
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
"src/styles.less"
],
"scripts": [],
"assets": [

@ -1 +1 @@
Subproject commit 717ead02b2f154c3a91e799ed5701ea23b54f7e8
Subproject commit e0a7362f8737aba5b857a47dbd323663369afd7e

@ -1 +1 @@
Subproject commit fd4dec1ab53c0a5f77a5d8717a265cee0688a612
Subproject commit 14655ae3aa7a50162ef218428a0ccdee35c1aa7b

@ -1 +1 @@
Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852
Subproject commit cb006f41395304e085d4ac012c7a031e46458f59

View File

@ -68,3 +68,8 @@
.number {
color: #1d1d1d;
}
.search-form {
background-color: inherit !important;
background-image: none !important;
}

View File

@ -42,7 +42,7 @@
<title>EOSC Explore</title>
</head>
<body>
<div class="uk-badge" style="border: 0px; border-radius: 0px; background-color: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
<div class="uk-badge" style="border: 0px; border-radius: 0px; background: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
<div class="uk-offcanvas-content uk-height-viewport">
<eosc-common-main-header></eosc-common-main-header>

View File

@ -10,8 +10,8 @@ export let properties: EnvProperties = {
adminToolsPortalType: "eosc",
dashboard: "eosc",
enablePiwikTrack: false,
useCache: true,
useLongCache: true,
useCache: false,
useLongCache: false,
showAddThis: true,
enableEoscDataTransfer: true,
framesAPIURL: "https://beta.openaire.eu/stats3/",

View File

@ -43,7 +43,7 @@
<title>Search OpenAIRE</title>
</head>
<body>
<div class="uk-badge" style="border: 0px; border-radius: 0px; background-color: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
<div class="uk-badge" style="border: 0px; border-radius: 0px; background: #bc2300 !important; position: absolute; z-index: 1000;">Beta instance</div>
<div class="uk-offcanvas-content uk-height-viewport">
<eosc-common-main-header></eosc-common-main-header>
<app-root></app-root>

View File

@ -1,4 +0,0 @@
/* You can add global styles to this file, and also import other style files */
@import "assets/openaire-theme/css/import.css";
@import "assets/common-assets/library.css";
@import "assets/portal-custom.css";

12
src/styles.less Normal file
View File

@ -0,0 +1,12 @@
///* You can add global styles to this file, and also import other style files */
//@import "assets/openaire-theme/css/import.css";
//@import "assets/common-assets/library.css";
//@import "assets/portal-custom.css";
/* You can add global styles to this file, and also import other style files */
@import "~src/assets/openaire-theme/less/_import";
@import "~src/assets/common-assets/less/general";
@import "~src/assets/common-assets/less/user";
@import "~src/assets/common-assets/less/linking";
@import "~src/assets/common-assets/less/landing";
@import "assets/portal-custom.css";