diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7981a1a..74b5ff3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,13 +2,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import {Irish} from "./shared/irish"; import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component"; -import {ClaimsModule} from "./claims/claims.module"; const routes: Routes = [ - { - path: '', - loadChildren: () => import('./national/national.module').then(m => m.NationalModule) - }, { path: 'rpo', loadChildren: () => import('./rpo/rpo.module').then(m => m.RpoModule), @@ -32,6 +27,10 @@ const routes: Routes = [ loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule), data: {title: Irish.METADATA_PREFIX + ' Admin | '}, }, + { + path: '', + loadChildren: () => import('./national/national.module').then(m => m.NationalModule) + }, {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule)}, {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)}, {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)}, diff --git a/src/app/national/national.component.ts b/src/app/national/national.component.ts index 713a304..8078151 100644 --- a/src/app/national/national.component.ts +++ b/src/app/national/national.component.ts @@ -1,7 +1,6 @@ import {Component, OnInit} from "@angular/core"; import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; -import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; import {ActivatedRoute, Router} from "@angular/router"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; @@ -9,23 +8,45 @@ import {Meta, Title} from "@angular/platform-browser"; import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {LinksResolver} from "../search/links-resolver"; import {CustomFilterService} from "../shared/customFilter.service"; +import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; @Component({ selector: 'national', template: ` - -
- Browse results -
-
- -
- + + +
+
+
+

{{entities.country}} {{entities.stakeholder}}

+
+
+
+
+ +
+
+
+
+ +
+ +

+ No {{entities.country}} {{entities.stakeholder}} yet. +

` }) -export class NationalComponent extends BaseComponent implements OnInit { +export class NationalComponent extends StakeholderBaseComponent implements OnInit { stakeholder: Stakeholder; loading: boolean = true; + isSearch: boolean = false; constructor(private stakeholderService: StakeholderService, protected _router: Router, @@ -36,7 +57,9 @@ export class NationalComponent extends BaseComponent implements OnInit { protected _meta: Meta, private _customFilterService:CustomFilterService) { super(); - super.initRouterParams(this._route); + super.initRouterParams(this._route, event => { + this.isSearch = event.url.includes('search'); + }); } ngOnInit() { @@ -47,7 +70,7 @@ export class NationalComponent extends BaseComponent implements OnInit { LinksResolver.setProperties(""); this.loading = false; } else { - + this.loading = false; } }); } diff --git a/src/app/national/national.module.ts b/src/app/national/national.module.ts index b357cdc..67aa019 100644 --- a/src/app/national/national.module.ts +++ b/src/app/national/national.module.ts @@ -2,17 +2,18 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; import {Route, RouterModule} from "@angular/router"; import {NationalComponent} from "./national.component"; +import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; const routes: Route[] = [ { path: '', component: NationalComponent, children: [ + {path: 'search', loadChildren: () => import('../search/search.module').then(m => m.SearchModule)}, {path: '', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, - {path: 'search', loadChildren: () => import('../search/search.module').then(m => m.SearchModule)} - ], data: {stakeholder: 'tubitak'} + ], data: {stakeholder: 'irish'} } ]; @NgModule({ - imports: [CommonModule, RouterModule.forChild(routes)], + imports: [CommonModule, RouterModule.forChild(routes), LoadingModule], declarations: [NationalComponent], exports: [NationalComponent], }) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a8c91dc..b8162fa 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a8c91dc04cb65db6d09b21d6159319dc3294f2a8 +Subproject commit b8162fa1e37ee70628a6ec31d6b145586bd94083 diff --git a/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts b/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts index 7197544..70d6a54 100644 --- a/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts +++ b/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts @@ -3,7 +3,9 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-my-orcid-links', template: ` - +
+ +
` }) diff --git a/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts b/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts index 8e11400..c906b6b 100644 --- a/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts +++ b/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts @@ -3,7 +3,9 @@ import {Component} from '@angular/core'; @Component({ selector: 'openaire-search-recommended-results-for-orcid', template: ` - +
+ +
` }) diff --git a/src/app/rfo/rfo.component.ts b/src/app/rfo/rfo.component.ts index 47498f1..5210d5d 100644 --- a/src/app/rfo/rfo.component.ts +++ b/src/app/rfo/rfo.component.ts @@ -1,7 +1,6 @@ -import {Component, OnDestroy, OnInit} from "@angular/core"; +import {Component, OnInit} from "@angular/core"; import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; -import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; import {ActivatedRoute, Router} from "@angular/router"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; @@ -9,27 +8,49 @@ import {Meta, Title} from "@angular/platform-browser"; import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {LinksResolver} from "../search/links-resolver"; import {CustomFilterService} from "../shared/customFilter.service"; +import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; @Component({ - selector: 'rpo', + selector: 'rfo', template: ` -
-
-
{{stakeholder.index_name}}
- - Browse results
-
-
- -
+ + +
+
+
+

{{stakeholder.name}}

+

{{entities.funders}}

+
+
+
+
+ +
+
+
+
+ +
+ ` }) -export class RfoComponent extends BaseComponent implements OnInit { +export class RfoComponent extends StakeholderBaseComponent implements OnInit { stakeholder: Stakeholder; alias: string; + isSearch: boolean = false; + loading: boolean = false; constructor(private stakeholderService: StakeholderService, - private _customFilterService:CustomFilterService, + private _customFilterService: CustomFilterService, protected _router: Router, protected _route: ActivatedRoute, protected seoService: SEOService, @@ -37,7 +58,9 @@ export class RfoComponent extends BaseComponent implements OnInit { protected _title: Title, protected _meta: Meta) { super(); - super.initRouterParams(this._route); + super.initRouterParams(this._route, event => { + this.isSearch = event.url.includes('search'); + }); } @@ -45,17 +68,25 @@ export class RfoComponent extends BaseComponent implements OnInit { this.params.subscribe(params => { this._customFilterService.setCustomFilter(null); this.alias = params['stakeholder']; - if(this.alias) { - this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(data => { - this.stakeholder = data; + if (this.alias) { + this.loading = true; + this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(stakeholder => { + this.stakeholder = stakeholder; + if (this.stakeholder && this.stakeholder.type === 'funder') { LinksResolver.resetProperties(); LinksResolver.setSearchAndResultLanding("rfo/" + this.stakeholder.alias); let value = this.stakeholder.index_id + "||" + this.stakeholder.index_name + "||" + this.stakeholder.index_shortName; this._customFilterService.setCustomFilter( - [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), - new SearchCustomFilter("RF0", "relfunder", value, this.stakeholder.index_name, true) + [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), + new SearchCustomFilter("RF0", "relfunder", value, this.stakeholder.index_name, true) ]); - })); + this.loading = false; + } else { + this.navigateToError(); + } + })); + } else { + this.stakeholder = null; } }); } diff --git a/src/app/rfo/rfo.module.ts b/src/app/rfo/rfo.module.ts index 7e185e3..f5d647e 100644 --- a/src/app/rfo/rfo.module.ts +++ b/src/app/rfo/rfo.module.ts @@ -2,18 +2,19 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; import {Route, RouterModule} from "@angular/router"; import {RfoComponent} from "./rfo.component"; +import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; const routes: Route[] = [ { path: '', component: RfoComponent, children: [ {path: '', loadChildren: () => import('../shared/browse-stakeholders/browse-stakeholder.module').then(m => m.BrowseStakeholderModule)}, - {path: ':stakeholder', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)}, - {path: ':stakeholder/search', loadChildren: () => import('../search/resultLanding.module').then(m => m.ResultLandingModule)} + {path: ':stakeholder/search', loadChildren: () => import('../search/resultLanding.module').then(m => m.ResultLandingModule)}, + {path: ':stakeholder', loadChildren: () => import('../shared/monitor/monitor.module').then(m => m.MonitorModule)} ] } ]; @NgModule({ - imports: [CommonModule, RouterModule.forChild(routes)], + imports: [CommonModule, RouterModule.forChild(routes), LoadingModule], declarations: [RfoComponent], exports: [RfoComponent], }) diff --git a/src/app/rpo/rpo.component.ts b/src/app/rpo/rpo.component.ts index 437a41f..ad706a0 100644 --- a/src/app/rpo/rpo.component.ts +++ b/src/app/rpo/rpo.component.ts @@ -1,32 +1,56 @@ -import {Component, OnDestroy, OnInit} from "@angular/core"; +import {Component, OnInit} from "@angular/core"; import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; -import {BaseComponent} from "../openaireLibrary/sharedComponents/base/base.component"; import {ActivatedRoute, Router} from "@angular/router"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service"; import {Meta, Title} from "@angular/platform-browser"; -import {CustomFilterService} from "../shared/customFilter.service"; -import {LinksResolver} from "../search/links-resolver"; import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; +import {LinksResolver} from "../search/links-resolver"; +import {CustomFilterService} from "../shared/customFilter.service"; +import {StakeholderBaseComponent} from "../openaireLibrary/monitor-admin/utils/stakeholder-base.component"; @Component({ selector: 'rpo', template: ` -
- -
-
- -
+ + +
+
+
+

{{stakeholder.name}}

+

{{entities.organizations}}

+
+
+
+
+ +
+
+
+
+ +
+ ` }) -export class RpoComponent extends BaseComponent implements OnInit { +export class RpoComponent extends StakeholderBaseComponent implements OnInit { stakeholder: Stakeholder; alias: string; + isSearch: boolean = false; + loading: boolean = false; constructor(private stakeholderService: StakeholderService, - private _customFilterService:CustomFilterService, + private _customFilterService: CustomFilterService, protected _router: Router, protected _route: ActivatedRoute, protected seoService: SEOService, @@ -34,7 +58,9 @@ export class RpoComponent extends BaseComponent implements OnInit { protected _title: Title, protected _meta: Meta) { super(); - super.initRouterParams(this._route); + super.initRouterParams(this._route, event => { + this.isSearch = event.url.includes('search'); + }); } @@ -42,22 +68,28 @@ export class RpoComponent extends BaseComponent implements OnInit { this.params.subscribe(params => { this._customFilterService.setCustomFilter(null); this.alias = params['stakeholder']; - if(this.alias) { - this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(data => { - this.stakeholder = data; - LinksResolver.resetProperties(); - LinksResolver.setSearchAndResultLanding("rpo/" + this.stakeholder.alias); - this._customFilterService.setCustomFilter( - [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), - new SearchCustomFilter("RPO", "relorganizationid", this.stakeholder.index_id, this.stakeholder.index_name, true) - ]); - - // TODO not correct id/ no irish? - - + if (this.alias) { + this.loading = true; + this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(stakeholder => { + this.stakeholder = stakeholder; + if (this.stakeholder && this.stakeholder.type === 'organization') { + LinksResolver.resetProperties(); + LinksResolver.setSearchAndResultLanding("rfo/" + this.stakeholder.alias); + let value = this.stakeholder.index_id + "||" + this.stakeholder.index_name + "||" + this.stakeholder.index_shortName; + this._customFilterService.setCustomFilter( + [new SearchCustomFilter("National", "country", "IE", "Irish National Monitor", false), + new SearchCustomFilter("RPO", "relorganizationid", this.stakeholder.index_id, this.stakeholder.index_name, true) + ]); + this.loading = false; + } else { + this.navigateToError(); + } })); + } else { + this.stakeholder = null; } }); } } + diff --git a/src/app/shared/browse-stakeholders/browse-stakeholder.component.html b/src/app/shared/browse-stakeholders/browse-stakeholder.component.html index 714b231..71b9a30 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholder.component.html +++ b/src/app/shared/browse-stakeholders/browse-stakeholder.component.html @@ -3,7 +3,7 @@ - +
@@ -130,4 +130,4 @@
- +
diff --git a/src/app/shared/browse-stakeholders/browse-stakeholder.component.ts b/src/app/shared/browse-stakeholders/browse-stakeholder.component.ts index 9893ab3..25be9e9 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholder.component.ts +++ b/src/app/shared/browse-stakeholders/browse-stakeholder.component.ts @@ -11,7 +11,7 @@ import {debounceTime, distinctUntilChanged} from "rxjs/operators"; @Component({ selector: 'browse-stakeholder', - templateUrl: `browse-stakeholder.component.html` + templateUrl: 'browse-stakeholder.component.html' }) export class BrowseStakeholderComponent extends StakeholderBaseComponent implements OnInit { stakeholderType: StakeholderType; @@ -74,9 +74,6 @@ export class BrowseStakeholderComponent extends StakeholderBaseComponent impleme })); } - private navigateToError() { - this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}}); - } private filtering(value) { if(!value){ diff --git a/src/app/shared/irish.ts b/src/app/shared/irish.ts index 7eb2988..42d44c1 100644 --- a/src/app/shared/irish.ts +++ b/src/app/shared/irish.ts @@ -1,5 +1,6 @@ import {Portal} from "../openaireLibrary/utils/entities/adminTool/portal"; import {StakeholderConfiguration} from "../openaireLibrary/monitor-admin/utils/indicator-utils"; +import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service"; export class Irish { public static METADATA_PREFIX = 'NOAMI | '; @@ -27,7 +28,9 @@ export class Irish { StakeholderConfiguration.VISIBILITIES = [ {icon: 'earth', value: "PUBLIC", label: 'Public'}, - ] + ]; + + LayoutService.HEADER_HEIGHT = '60px'; } } diff --git a/src/app/shared/monitor/monitor.component.html b/src/app/shared/monitor/monitor.component.html index 26bd5e9..f721e1d 100644 --- a/src/app/shared/monitor/monitor.component.html +++ b/src/app/shared/monitor/monitor.component.html @@ -1,18 +1,166 @@ -
+
- +
- +
+ No {{entities.stakeholder}} yet. +
+
+ +
+
{{number.title}}
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+ + + + + +
+
+
+
+ + + + + +
+
+

+ {{indicator.description}} +

+

+ {{indicator.additionalDescription}} +

+
+
+
+
+ +
+
+
{{number.title}}
+
+
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+
+
+ +
+
+
+ + +
+
{{chart.title}}
+
{{chart.title}}
+ +
+
+
+
+ {{indicator.name + " "}} +
+
+ +
+ +
+ +
+ +
+
+ + + + Note + + +
+
+
+
+
+ +
+
+

+ {{indicator.description}} +

+

+ {{indicator.additionalDescription}} +

+
+
+
+
+
+
+
+ +
+ +
diff --git a/src/app/shared/monitor/monitor.component.ts b/src/app/shared/monitor/monitor.component.ts index f90bf45..9b34b78 100644 --- a/src/app/shared/monitor/monitor.component.ts +++ b/src/app/shared/monitor/monitor.component.ts @@ -17,7 +17,6 @@ import {SEOService} from "../../openaireLibrary/sharedComponents/SEO/SEO.service templateUrl: 'monitor.component.html' }) export class MonitorComponent extends MonitorIndicatorStakeholderBaseComponent { - tabsClass: string = 'uk-tab'; constructor(protected _route: ActivatedRoute, protected _router: Router, diff --git a/src/app/shared/monitor/monitor.module.ts b/src/app/shared/monitor/monitor.module.ts index 77a51a1..f9e8d52 100644 --- a/src/app/shared/monitor/monitor.module.ts +++ b/src/app/shared/monitor/monitor.module.ts @@ -4,11 +4,17 @@ import {RouterModule} from "@angular/router"; import {MonitorComponent} from "./monitor.component"; import {PageContentModule} from "../../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module"; import {SliderTabsModule} from "../../openaireLibrary/sharedComponents/tabs/slider-tabs.module"; +import {NumberRoundModule} from "../../openaireLibrary/utils/pipes/number-round.module"; +import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; +import {ClickModule} from "../../openaireLibrary/utils/click/click.module"; @NgModule({ imports: [CommonModule, RouterModule.forChild([ - {path: '', component: MonitorComponent} - ]), PageContentModule, SliderTabsModule], + {path: '', component: MonitorComponent}, + {path: ':topic/', component: MonitorComponent}, + {path: ':topic/:category', component: MonitorComponent}, + {path: ':topic/:category/:subCategory', component: MonitorComponent} + ]), PageContentModule, SliderTabsModule, NumberRoundModule, IconsModule, ClickModule], declarations: [MonitorComponent], exports: [MonitorComponent] }) diff --git a/src/app/upload-dois/upload-dois.component.html b/src/app/upload-dois/upload-dois.component.html index 9e98f29..e98ea65 100644 --- a/src/app/upload-dois/upload-dois.component.html +++ b/src/app/upload-dois/upload-dois.component.html @@ -1,27 +1,29 @@
-
-
-
Title
-
Lorem ipsum.......
-
-
-
- - - - upload new file - - -
-
-
- -
+
+
+
- {{filesToUpload[0].name}} - +
Title
+
Lorem ipsum.......
+
+
+
+ +
+
+ +
+ {{filesToUpload[0].name}} + +
+
+
@@ -37,7 +39,7 @@
Maximum size: 5 MB
-
+
diff --git a/src/assets/chart-placeholder.png b/src/assets/chart-placeholder.png new file mode 100644 index 0000000..dd343fd Binary files /dev/null and b/src/assets/chart-placeholder.png differ diff --git a/src/assets/common-assets b/src/assets/common-assets index d1b2d5e..6bb1e61 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 +Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 diff --git a/src/assets/extend-theme/less/_import-variables.less b/src/assets/extend-theme/less/_import-variables.less new file mode 100644 index 0000000..532356a --- /dev/null +++ b/src/assets/extend-theme/less/_import-variables.less @@ -0,0 +1,3 @@ +@import "~uikit/src/less/components/variables"; +@import "~src/assets/openaire-theme/less/variables"; +@import "~src/assets/extend-theme/less/variables"; diff --git a/src/assets/extend-theme/less/_import.less b/src/assets/extend-theme/less/_import.less new file mode 100644 index 0000000..e52ad86 --- /dev/null +++ b/src/assets/extend-theme/less/_import.less @@ -0,0 +1,16 @@ +@import "~src/assets/openaire-theme/less/_import"; + +// Base +@import "variables"; + +// Elements +@import "button"; + +// Navs +@import "navbar"; + +// Utilities +@import "background"; + +// Extra +@import "banner"; diff --git a/src/assets/extend-theme/less/background.less b/src/assets/extend-theme/less/background.less new file mode 100644 index 0000000..2dde90f --- /dev/null +++ b/src/assets/extend-theme/less/background.less @@ -0,0 +1 @@ +@background-primary-background-gradient: none; diff --git a/src/assets/extend-theme/less/banner.less b/src/assets/extend-theme/less/banner.less new file mode 100644 index 0000000..3bd57bc --- /dev/null +++ b/src/assets/extend-theme/less/banner.less @@ -0,0 +1,78 @@ +@banner-background: @irish-thin-color; +@banner-mode: dark; + +@banner-footer-background: transparent; + +@banner-tab-gutter: 60px; +@banner-tab-margin-bottom: @global-small-margin; +@banner-tab-divider: @global-border-width solid @global-border; +@banner-tab-divider-height: @global-line-height; +@banner-tab-item-color: @global-color; +@banner-tab-item-hover-color: @global-secondary-background; +@banner-tab-item-active-color: @global-secondary-background; +@banner-tab-item-active-indicator: @global-background; + +.uk-banner:extend(.uk-section) { + background: @banner-background; + position: relative; + + & .uk-banner-footer { + background: @banner-footer-background; + position: absolute; + bottom: 0; + left: 0; + right: 0; + + & ul.uk-banner-tab:extend(.uk-flex) { + list-style: none; + margin-bottom: @banner-tab-margin-bottom; + + & > li { + &:not(:first-child) { + margin-left: @banner-tab-gutter; + position: relative; + + &::before { + content: ''; + position: absolute; + left: -1 * (@banner-tab-gutter/2); + transform: translateX(-100%); + border-left: @banner-tab-divider; + height: @banner-tab-divider-height; + } + } + + a { + color: @banner-tab-item-color; + text-transform: uppercase; + text-decoration: none; + } + + &:hover a { + color:@banner-tab-item-hover-color; + } + + &.uk-active a { + color: @banner-tab-item-active-color; + font-weight: @text-bold-weight; + position: relative; + + &:after { + content: ''; + position: absolute; + bottom: -@banner-tab-margin-bottom; + left: 50%; + transform: translate(-50%, 50%); + width: 0; + height: 0; + border-left: 2*@banner-tab-margin-bottom solid transparent; + border-right: 2*@banner-tab-margin-bottom solid transparent; + border-bottom: @banner-tab-margin-bottom solid @banner-tab-item-active-indicator; + } + } + } + } + } +} + +.uk-banner:extend(.uk-light all) when (@banner-mode = light) {} diff --git a/src/assets/irish-theme/button.less b/src/assets/extend-theme/less/button.less similarity index 52% rename from src/assets/irish-theme/button.less rename to src/assets/extend-theme/less/button.less index b354e50..63ce1db 100644 --- a/src/assets/irish-theme/button.less +++ b/src/assets/extend-theme/less/button.less @@ -1,3 +1,15 @@ +/* Primary */ +@button-primary-background: @global-primary-background; +@button-primary-background-gradient: none; +@button-primary-color: @global-inverse-color; +@button-primary-box-shadow: @global-medium-box-shadow; +@button-primary-border: transparent; +@button-primary-hover-background: @global-secondary-background; +@button-primary-hover-background-gradient: none; +@button-primary-hover-color: @global-inverse-color; +@button-primary-hover-box-shadow: @global-small-box-shadow; +@button-primary-hover-border: transparent; + /* Secondary */ @button-secondary-background: @global-secondary-background; @button-secondary-background-gradient: none; diff --git a/src/assets/extend-theme/less/color.less b/src/assets/extend-theme/less/color.less new file mode 100644 index 0000000..5fe56b9 --- /dev/null +++ b/src/assets/extend-theme/less/color.less @@ -0,0 +1,12 @@ +@irish-primary-color: #009A49; +@irish-light-color: #25AE7A; +@irish-dark-color: #002B1A; +@irish-secondary-color: #FF7901; +@irish-thin-color: #DCE9E3; +@irish-global-background: #F9FBFC; + + +@funder-color: #4D276F; +@organization-color: #f5cc1c; +@country-color: @irish-primary-color; +@datasource-color: #D45E50; diff --git a/src/assets/irish-theme/navbar.less b/src/assets/extend-theme/less/navbar.less similarity index 100% rename from src/assets/irish-theme/navbar.less rename to src/assets/extend-theme/less/navbar.less diff --git a/src/assets/irish-theme/variables.less b/src/assets/extend-theme/less/variables.less similarity index 89% rename from src/assets/irish-theme/variables.less rename to src/assets/extend-theme/less/variables.less index d2241eb..f7bdd32 100644 --- a/src/assets/irish-theme/variables.less +++ b/src/assets/extend-theme/less/variables.less @@ -1,8 +1,11 @@ +@import "color"; + /** Backgrounds */ @global-primary-background: @irish-primary-color; @global-secondary-background: @irish-secondary-color; @global-background: @irish-global-background; @global-primary-gradient: radial-gradient(closest-side at 50% 50%, @irish-light-color 0%, @irish-dark-color 100%); +@global-muted-background: @gray-300; /** Borders */ @global-border: @gray-300; diff --git a/src/assets/irish-monitor.less b/src/assets/irish-monitor.less index 6128c36..4d98861 100644 --- a/src/assets/irish-monitor.less +++ b/src/assets/irish-monitor.less @@ -1,3 +1,5 @@ +@general-search-form-background: none; + .irish-monitor { /* Import OpenAIRE theme*/ @import (multiple) "~src/assets/openaire-theme/less/_import"; diff --git a/src/assets/irish-theme/_import.less b/src/assets/irish-theme/_import.less deleted file mode 100644 index cc8f41c..0000000 --- a/src/assets/irish-theme/_import.less +++ /dev/null @@ -1,21 +0,0 @@ -@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/landing"; -@import "~src/assets/common-assets/less/linking"; -@import "~src/assets/common-assets/less/dashboard"; -@import "~src/assets/common-assets/less/ckeditor"; - -@import "colors"; - -// Base -@import "variables"; - -// Elements -@import "button"; - -// Navs -@import "navbar"; - -// Utilities -@import "background"; diff --git a/src/assets/irish-theme/background.less b/src/assets/irish-theme/background.less deleted file mode 100644 index 376c73c..0000000 --- a/src/assets/irish-theme/background.less +++ /dev/null @@ -1,2 +0,0 @@ -@background-primary-background: @irish-primary-background; -@background-primary-background-gradient: none; diff --git a/src/assets/irish-theme/colors.less b/src/assets/irish-theme/colors.less deleted file mode 100644 index 9ac2f54..0000000 --- a/src/assets/irish-theme/colors.less +++ /dev/null @@ -1,6 +0,0 @@ -@irish-primary-color: #1B895F; -@irish-light-color: #25AE7A; -@irish-dark-color: #002B1A; -@irish-secondary-color: #FF7901; -@irish-primary-background: #DCE9E3; -@irish-global-background: #F9FBFC; diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..928dfa1 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit 928dfa11bd4aeadb30c2d72d408c7b7206d6598e diff --git a/src/styles.less b/src/styles.less index 269d904..5dd7d53 100644 --- a/src/styles.less +++ b/src/styles.less @@ -1,4 +1,10 @@ /* You can add global styles to this file, and also import other style files */ /* Import OpenAIRE theme*/ -@import "~src/assets/irish-theme/_import"; +@import "~src/assets/extend-theme/less/_import"; +@import "~src/assets/common-assets/less/general"; +@import "~src/assets/common-assets/less/user"; +@import "~src/assets/common-assets/less/landing"; +@import "~src/assets/common-assets/less/linking"; +@import "~src/assets/common-assets/less/dashboard"; +@import "~src/assets/common-assets/less/ckeditor"; @import "~src/assets/irish-monitor";