From 3d4335c89fe0a1453bc01a480ccbc4b57b17a17b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 28 Mar 2022 01:36:58 +0300 Subject: [PATCH] Remove padding from edit-stakeholder. Fix margins in monitor page. Update libraries --- .../edit-stakeholder.component.ts | 15 +- src/app/general/general.component.html | 3 +- src/app/monitor/monitor.component.html | 250 +++++++++--------- src/app/openaireLibrary | 2 +- src/assets/dashboard-theme | 2 +- src/assets/monitor-dashboard-custom.css | 3 +- src/assets/openaire-theme | 2 +- 7 files changed, 135 insertions(+), 142 deletions(-) diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts index 24b1248..50d73da 100644 --- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts +++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts @@ -3,7 +3,7 @@ import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder"; import {FormBuilder, FormGroup, Validators} from "@angular/forms"; import {StakeholderUtils} from "../../utils/indicator-utils"; import {Option} from "../../openaireLibrary/sharedComponents/input/input.component"; -import {Subscriber, Subscription} from "rxjs"; +import {Subscription} from "rxjs"; import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties"; import {properties} from "../../../environments/environment"; import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service"; @@ -20,12 +20,9 @@ declare var UIkit; @Component({ selector: 'edit-stakeholder', template: ` -
+
-
+
Name
- +
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index cc5505e..0f69b68 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -46,7 +46,7 @@

{{stakeholder.name}}

-
+
  • -->
-
+
-
-
-
-

- - Private data -

+
+
+

+ + Private data +

+
+
+
+
+
+ {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description + : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description : + (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}}
-
-
-
- {{activeSubCategory && activeSubCategory.description && activeSubCategory.description.length > 0 ? activeSubCategory.description - : (activeCategory && activeCategory.description && activeCategory.description.length > 0 ? activeCategory.description : - (activeTopic.description && activeTopic.description.length > 0 ? activeTopic.description : ""))}} -
+ +
+

+ No indicators available yet. Stay tuned! +

- -
-

- No indicators available yet. Stay tuned! -

-
- - - -
-
{{number.title}}
- -
-
-
- -
- {{numberResults.get(i + '-' + j) | number}} - -- -
-
{{indicator.name}}
+ + + +
+
{{number.title}}
+ +
+
+
+ +
+ {{numberResults.get(i + '-' + j) | number}} + --
+
{{indicator.name}}
+
+
+
+
+ {{indicator.description}} +
+
+ {{indicator.additionalDescription}} +
+
+
+
+
+ +
+ +
+ +
+
{{chart.title}}
+ +
+
+
+

+
{{indicator.name + " "}}
+

+
+ +
+
+ Filtered: {{chartsActiveType.get(i + '-' + j).filtersApplied}} out of + {{countSelectedFilters()}}
+ +
+ I frames preview is disabled +
+ +
+
-
-
+
+

+ {{indicator.description}} -

-
+ +
+ {{indicator.additionalDescription}} -
+ +

@@ -157,80 +212,23 @@
-
- -
-
{{chart.title}}
- -
-
-
-

-
{{indicator.name + " "}}
-

-
- -
-
- Filtered: {{chartsActiveType.get(i + '-' + j).filtersApplied}} out of - {{countSelectedFilters()}}
- -
- I frames preview is disabled -
- -
- -
-
-

- - {{indicator.description}} - -
- - {{indicator.additionalDescription}} - -

-
-
-
-
- -
- +
+
+ +
+ + Powered by + OpenAIRE Research Graph + + . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}} +
-
- -
- - Powered by - OpenAIRE Research Graph - - . Last update of statistics in OpenAIRE: {{statsUpdateDate | date: 'MMM dd, yyyy'}} - -
- -
- Send us your feedback. -
+ +
+ Send us your feedback.
- -
+
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3fd632a..dc0544d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3fd632a2b754a336615b8a776bea95ee9808e93c +Subproject commit dc0544d0d8f54071cb7c9bffec36de19b0bccd68 diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme index d4d37fc..27598ac 160000 --- a/src/assets/dashboard-theme +++ b/src/assets/dashboard-theme @@ -1 +1 @@ -Subproject commit d4d37fc52dd45a0cb9917403d5ce37732cab164e +Subproject commit 27598ac7359cb13b5017ee1f97b7bd2c743659ae diff --git a/src/assets/monitor-dashboard-custom.css b/src/assets/monitor-dashboard-custom.css index 4f61cee..22eaf7f 100644 --- a/src/assets/monitor-dashboard-custom.css +++ b/src/assets/monitor-dashboard-custom.css @@ -1,6 +1,7 @@ .stakeholderPage { /* Structure */ - --structure-page-content-background-color: #EDF1FA; + --structure-page-content-background-color: #F3F3F3; + --structure-page-content-background-color-rgb: 243, 243, 243; /* Navbar */ --navbar-background-image: url("~src/assets/banner.jpg"); diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 9f07792..60b581d 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 9f07792c4368f8b1e4d41ca7cd8e47f257a25885 +Subproject commit 60b581dc8e8aa393cd3b7e604375132e015acaf8