From dc784afe4b8f7a66bbd7ee73f4373687b747086e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 23 Sep 2022 16:33:26 +0300 Subject: [PATCH] [Aggregator | Trunk]: Renaming and using less files for assets | Updating home page to look ok | TODO: Fix less files to be real less & organize rules among files. --- angular.json | 4 +- src/app/home/home.component.html | 243 ++++++++++-------- src/app/home/home.component.ts | 10 +- src/app/openaireLibrary | 2 +- ...ator-custom.css => aggregator-custom.less} | 11 + src/assets/openaire-theme | 2 +- src/material.scss | 9 - src/styles.css | 4 - src/styles.less | 5 + 9 files changed, 166 insertions(+), 124 deletions(-) rename src/assets/{aggregator-custom.css => aggregator-custom.less} (90%) delete mode 100644 src/material.scss delete mode 100644 src/styles.css create mode 100644 src/styles.less diff --git a/angular.json b/angular.json index 4469700..fe72b74 100644 --- a/angular.json +++ b/angular.json @@ -46,8 +46,8 @@ "src/robots.txt" ], "styles": [ - "src/styles.css", - "src/material.scss" + "src/styles.less", + "src/assets/common-assets/library-css/material.scss" ], "scripts": [ "node_modules/uikit/dist/js/uikit.min.js", diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 92f350f..89dfc9f 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,96 +1,116 @@ -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
- <!– (click)="goTo(false)"–> - Advanced Search - Advanced Search
-
- -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + +
+ +
+
+ +
-
--> -
- -
-
-
- -
- - -
- - -
-
- -
-
-
-
-
-
+
@@ -102,10 +122,10 @@
- Read more + Read more
- Read less + Read less
@@ -126,22 +146,35 @@

Our Canadian Funders

-
+
-
-
- +
+ + + + + +
+
+
+ +
+
+
+
+
{{funder.name}}
+
+
+
{{funder.publications | number}}
research outcomes found +
+
+
{{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%
Open Access +
+
+
+
-
-
{{funder.name}}
-
-
-
{{funder.publications | number}}
research outcomes found -
-
-
{{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%
Open Access -
-
@@ -176,7 +209,7 @@ this.customFilter.valueId == 'CA')"> software, etc.)
- Deposit
@@ -195,7 +228,7 @@ this.customFilter.valueId == 'CA')"> your research results and claim them to your project. - Link diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index d1767ae..2984c22 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -1,4 +1,4 @@ -import {Component, ViewChild} from '@angular/core'; +import {ChangeDetectorRef, Component, ViewChild} from '@angular/core'; import {Subscription, zip} from 'rxjs'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; @@ -78,7 +78,8 @@ export class HomeComponent { private _refineFieldResultsService:RefineFieldResultsService, private location: Location, private _piwikService:PiwikService, private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService, - private helper: HelperService + private helper: HelperService, + private cdr: ChangeDetectorRef ) { this.aggregatorId = ConnectHelper.getCommunityFromDomain(properties.domain); this.aggregator = PortalAggregators.getFilterInfoByMenuId(this.aggregatorId); @@ -293,4 +294,9 @@ export class HomeComponent { } return false; } + + disableSelectChange(event: boolean) { + this.disableSelect = event; + this.cdr.detectChanges(); + } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4cec290..3605621 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4cec2907da5e1bf55cf59930c23dd9a45c569b89 +Subproject commit 360562178bff4ef9a94b2481b4b84ba9c32e599c diff --git a/src/assets/aggregator-custom.css b/src/assets/aggregator-custom.less similarity index 90% rename from src/assets/aggregator-custom.css rename to src/assets/aggregator-custom.less index 066c78c..0f6c964 100644 --- a/src/assets/aggregator-custom.css +++ b/src/assets/aggregator-custom.less @@ -103,3 +103,14 @@ font-size: 60px; font-weight: 300; } + +.numbers-background { + background: transparent url('numbers_background_pattern.svg') repeat-x center bottom; +} + +.graph-background { + background-size: cover !important; + padding-bottom: 100px; + background-color: #FAFAFA !important; + background: var(--graph-background); +} \ No newline at end of file diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index f085a90..bc0edde 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit f085a90973b216b89065848dba864e2d581acc84 +Subproject commit bc0edde68dccfc17c1abc5d5aa3721f720aee852 diff --git a/src/material.scss b/src/material.scss deleted file mode 100644 index 50525af..0000000 --- a/src/material.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '~@angular/material/theming'; -@include mat-core(); -$my-app-primary: mat-palette($mat-gray, 900); -$my-app-accent: mat-palette($mat-light-green, 700); - -$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent); - -@include angular-material-theme($my-app-theme); - diff --git a/src/styles.css b/src/styles.css deleted file mode 100644 index 1b07fdc..0000000 --- a/src/styles.css +++ /dev/null @@ -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"; diff --git a/src/styles.less b/src/styles.less new file mode 100644 index 0000000..fba6633 --- /dev/null +++ b/src/styles.less @@ -0,0 +1,5 @@ +/* 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 "assets/aggregator-custom";