From a6404f71206d8c5c1e7aae4ba036b8e55538925e Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 6 Apr 2020 14:51:22 +0000 Subject: [PATCH] Apply changes from Elixir branch r58296 add impact factors: add fontawesome (package.json, styles.css, angular.json) add them in community page - most recent results git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58414 d315682c-612b-4755-9ff5-7f18f6832af3 --- angular.json | 2 + package.json | 1 + .../results/results.component.ts | 2 +- src/assets/connect-custom.css | 42 +++++++++++++++++++ src/styles.css | 1 + 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/angular.json b/angular.json index 70fd685..0aa78ac 100644 --- a/angular.json +++ b/angular.json @@ -23,6 +23,7 @@ "styles": [ "src/styles.css", "src/material.scss", + "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "node_modules/datatables.net-dt/css/jquery.dataTables.css" ], "scripts": [ @@ -81,6 +82,7 @@ "styles": [ "src/styles.css", "src/material.scss", + "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "node_modules/datatables.net-dt/css/jquery.dataTables.css" ], "assets": [ diff --git a/package.json b/package.json index 178fb82..bf24499 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@angular/platform-browser-dynamic": "7.2.14", "@angular/platform-server": "7.2.14", "@angular/router": "7.2.14", + "@fortawesome/fontawesome-free": "^5.12.1", "@nguniversal/express-engine": "^6.0.0", "@nguniversal/module-map-ngfactory-loader": "^6.0.0", "@types/express": "^4.16.1", diff --git a/src/app/searchEntries/results/results.component.ts b/src/app/searchEntries/results/results.component.ts index 646937f..60ee931 100644 --- a/src/app/searchEntries/results/results.component.ts +++ b/src/app/searchEntries/results/results.component.ts @@ -49,7 +49,7 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult"; --> + [type]="resultType" [properties] = properties class="communityRecentResults" [showImpactFactors]="(community.communityId == 'elixir-gr')" > diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css index 8fe34f7..dfb8a01 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.css @@ -182,3 +182,45 @@ div:not(.connect_App) bottom .uk-totop{ .communityPanelBackground .uk-grid-divider > :not(.uk-first-column)::before { border-left: 1px solid rgba(255, 255, 255, .2); } + + +/* +Impact Factor - ATHENA CODE */ +#popularity-A{ + color:red; + content: 'Test'; +} +#popularity-B{ + color:#eabd35; + content: 'Test'; +} + +#popularity-C{ + color:grey; + content: 'Test'; +} + +#influence-A{ + color:red; + content: 'Test'; +} +#influence-B{ + color:#eabd35; + content: 'Test'; +} + +#influence-C{ + color:grey; + content: 'Test'; +} +.fa-university::before { + + content: "\f19c"; + +} +.fa-fire::before { + + content: "\f06d"; + +} +/* ATHENA CODE */ diff --git a/src/styles.css b/src/styles.css index 5f69d4f..2928efe 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,2 +1,3 @@ /* You can add global styles to this file, and also import other style files */ @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "~@fortawesome/fontawesome-free/css/all.min.css"; /*ATHENA CODE */