diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 16fb54c..a8ea711 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -78,7 +78,8 @@ export class AppComponent { logoSmallUrl: this.agg.logoUrl, position: 'center', menuPosition: 'center', - badge: false + badge: false, + darkBg: true }; this.buildMenu(); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index fc3cca0..7f6c88c 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,48 +1,52 @@
-
-
-
-
- -
- - -
- - -
-
- +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+ +
+
+
-
- -
-
-
-
-
-
- Welcome to EOSC Explore - -
- The in-context research discovery portal over the EOSC Exchange and the global map of science. -
-
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
- - -
+
+
+
+ +
+
+
+
+

Welcome to EOSC Explore

+


+ The in-context research discovery portal over the EOSC Exchange and the global map of science. +

+
+
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
+
+
+ +
@@ -124,4 +128,4 @@
- +
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 65cc850..f935e81 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 65cc8504eaa645b32af7ea4238445d9cc47c2556 +Subproject commit f935e81959f8f71b0057ecd6c116db444cd97846 diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index c7e044d..0bead0a 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchDataProvidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index fdf9016..1bef7d0 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts index 36222ae..b9ba48d 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -15,7 +15,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts index 15e05f6..16a9f7d 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -19,7 +19,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts index e83b405..274ef16 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -14,7 +14,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/advanced/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts index 60fff71..55e4c59 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/src/app/searchPages/find/search.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchComponent{ piwikSiteId = properties.piwikSiteId; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() {} } diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 4a8948b..1afff3c 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchDataprovidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts index a5f4f32..b5dab2a 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index d5a19b6..2942bf2 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts index 7e6daa7..d581f8f 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -13,7 +13,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts index 8d7f795..22fe433 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index ee3ab82..5160784 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -34,115 +34,10 @@ export class AggregatorInfo { export class PortalAggregators { static eoscInfo: AggregatorInfo = - new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", + new AggregatorInfo("eosc", "Eosc Explore", "https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png", null, null, null, null,null,null ,false,false, ` - :root { - --primary-color: #3540b6; - --primary-dark-color: #233d4c; - --search-form-background: transparent; - - } - .search-input { - --search-input-border-radius: 0px; - } - .input-wrapper.advanced-search { - --input-border-radius: 0px; - } - .input-wrapper { - --input-border-radius: 0px; - } - a, .uk-link, a.uk-link-heading{ - color: #3540b6; - } - a:hover, .uk-link:hover, a.uk-link-heading:hover{ - color: #233d4c; - text-decoration: none; - } - .uk-link-text a:hover, .uk-link-toggle:hover .uk-link-text, a.uk-link-text:hover{ - color:#0c2bd5; - } -.search_box_bg { - /*background: url(//marketplace.eosc-portal.eu/packs/media/images/home-bg-89b63b3d579f3530ec6283f51e1648bc.png) no-repeat;*/ - /* background-position-x: 0%;*/ - /* background-position-y: 0%;*/ - /* background-position: 50% -120px;*/ - z-index: 3; -} -#searchImage{ -background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-color-883f208671ef77b15b9cd067ecdc369b.png') no-repeat center left; -width: 250px; -height: 80px; -background-size: 250px 80px; -/*margin-left: 80px;*/ -} -#searchForm advanced-search-form{ -float:right; -} -#searchForm{ -/*padding:0;*/ - /*width:100%;*/ - /*max-width:100%;*/ -} -search-filter h6::after{ -border-bottom: 1px solid gray; -} -search-filter h6{ -text-transform: uppercase !important; -font-size: 12px; -} - -search-filter .tm-child-list-divider > ul > li:nth-child(n+2), .uk-list-divider > li:nth-child(n+2){ -border: none; -} - -.filterHeader{ -border-bottom:1px solid #ced4da; -} -.matSelection.mat-select { - - padding: 4px; - border: 1px solid #ced4da; - -} - -.search-results .uk-card-default.uk-card-hover:hover{ - box-shadow: none; -} -.search-results .uk-card-default { - border: 1px solid #ced4da; - box-shadow:none; -} - - -.uk-pagination > .uk-active > *, .uk-pagination > .uk-active > :hover { - - border-radius: 0px; - -} - .uk-button-primary:not(.uk-icon-button), .portal-button:not(.uk-icon-button) { - color: #fff !important; - background-color: #0c2bd5 !important; - background-image: linear-gradient(135deg,#05cae7,#0c2bd5) !important; - border:none !important; - } - - .uk-button-primary:hover, .portal-button:hover:not(.uk-icon-button) { - background: #0c2bd5 !important; - border:none !important; - } - - .search_box_bg .uk-button, #searchForm .uk-button:not(.uk-button-text):not(.uk-button-link), .search_box_bg .uk-button:hover, #searchForm .uk-button:hover:not(.uk-button-text):not(.uk-button-link) { - border-radius: 0px; - margin-left: 0px !important; - color: rgb(102, 102, 102) !important; - background-color: #0c2bd5 !important; - background-color: rgba(255, 255, 255, 1.0) !important; - border: 1px solid rgba(0, 0, 0, 0.40) !important; - background-image: none !important; - padding: 10px; - } `); static disabled = { diff --git a/src/assets/common-assets b/src/assets/common-assets index 2de3f62..99fab06 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c +Subproject commit 99fab0671bee8251230599ef9bc3034aff39c141 diff --git a/src/assets/eosc-custom.less b/src/assets/eosc-custom.less new file mode 100644 index 0000000..4f1391b --- /dev/null +++ b/src/assets/eosc-custom.less @@ -0,0 +1,132 @@ +/* EOSC */ +//@eosc-color: #3D4DB6; +//@eosc-light-color: #E80000; +//@eosc-dark-color: #AD0000; +//@eosc-secondary-color: #AD0000; +//@eosc-default-background: #F2F2F2; +// +////@global-primary-gradient: linear-gradient(104deg, @eosc-dark-color 0%, @eosc-light-color 100%); +//@global-primary-gradient: @eosc-light-color; +// +///* Button */ +//@button-primary-background: @eosc-color; +//@inverse-button-primary-background: @eosc-color; +//@button-primary-hover-background: @eosc-secondary-color; +//@button-primary-active-background: @eosc-secondary-color; +// +///* Background */ +//@background-primary-background: @eosc-color; +//@background-primary-background-gradient: none; +// +///* Text */ +//@text-primary-color: @eosc-color; +// +///* Label */ +//@label-secondary-color: @eosc-color; +// +///* General */ +//@general-tab-featured-tab: @eosc-color; +// +///* Landing */ +//@landing-portal-color: @eosc-color; +// +//.search-form { +// background-color: rgba(61,77, 182); +//} + + +@eosc-color: #3D4DB6; +@eosc-light-color: #05A6E7; +@eosc-dark-color: #0C2BD5; +//@eosc-secondary-color: #2255A4; +@eosc-secondary-color: #1890FF; +@eosc-default-background: #F2F2F2; + + +@global-primary-background: @eosc-color; +@global-secondary-background: @eosc-secondary-color; + +@general-search-form-background: @eosc-color; +@base-body-background: @eosc-default-background; + +.image-front-topbar, .search-form, #main-menu .uk-navbar-container, #main-menu-small .uk-navbar-container { + background: @global-primary-background; +} + +#searchImage{ + background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png') no-repeat center left; + width: 203px; + height: 79px; + background-size: 203px 79px; +} + +.search-results-container { + background-color: white; + border-radius: 25px; +} +// +//.contentbox { +// display: block; +// position: relative; +//} +// +//.contentbox > div { +// width: 58%; +// display: flex; +// flex-direction: column; +// justify-content: center; +//} +// +//.contentbox > div > div { +// width: 90%; +//} +// +//aside { +// background: transparent; +// position: absolute; +// top: -25px; +// right: -100px; +// width: 68%; +// +// display: block; +//} +// +//.contentbox img { +// max-width: 100%; +// min-width: 45%; +// height: auto; +//} +// +//@media (max-width: 576px) { +// .contentbox { +// display: flex; +// flex-direction: column-reverse; +// } +//} +// +//@media (max-width: 991px) { +// .contentbox { +// flex-direction: column; +// align-items: normal; +// } +//} +// +//@media (max-width: 1120px) { +// .contentbox > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox > div > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox aside { +// position: relative; +// width: 100%; +// right: auto; +// } +//} \ No newline at end of file diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index f902074..a9acdff 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd +Subproject commit a9acdff7b3249794e002bffff52c07babc3d9d06 diff --git a/src/styles.less b/src/styles.less index ebb671c..f476716 100644 --- a/src/styles.less +++ b/src/styles.less @@ -9,4 +9,5 @@ @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"; \ No newline at end of file +//@import "assets/portal-custom.css"; +@import "assets/eosc-custom"; \ No newline at end of file