From cf1ea7f2b2d67263764ea7ccfb20471ff9f1bf05 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 13 Nov 2023 16:26:38 +0200 Subject: [PATCH 1/4] [develop]: Update library --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3aff9ee..293be5e 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3aff9ee76e9bd06ee6beffa660dbccde3eef2cd1 +Subproject commit 293be5e1d23e6f0f89344407331983b3e66afc9c From a94619a46fa079665eec0e3aa4e3dd5ee8d6231a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 16 Nov 2023 11:38:06 +0200 Subject: [PATCH 2/4] [develop | DONE]: import indicators.less from common assets --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/styles.less | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 293be5e..054d7ff 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 293be5e1d23e6f0f89344407331983b3e66afc9c +Subproject commit 054d7ff51e7817332490bac55b6bfd3cf2f1e391 diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bb1e61..4f534fc 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit 4f534fc826ffbb6b0d3a8ddd47225f744dc3c1b8 diff --git a/src/styles.less b/src/styles.less index 98e2c65..9bbe777 100644 --- a/src/styles.less +++ b/src/styles.less @@ -5,6 +5,7 @@ @import "~src/assets/common-assets/less/general"; @import "~src/assets/common-assets/less/user"; @import "~src/assets/common-assets/less/dashboard"; +@import "~src/assets/common-assets/less/indicators"; @import "~src/assets/common-assets/less/ckeditor"; @import "~src/assets/monitor-dashboard-custom"; @import "assets/print.css"; From 8e10efff389cae0d113c6dbd7502b4fb06ee5f52 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 12 Dec 2023 10:11:05 +0200 Subject: [PATCH 3/4] Add copy.js and update libraries --- angular.json | 1 + src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index 6a72b29..dc0aa95 100644 --- a/angular.json +++ b/angular.json @@ -48,6 +48,7 @@ "src/assets/common-assets/library-css/material.scss" ], "scripts": [ + "src/assets/common-assets/js/copy.js", "node_modules/uikit/dist/js/uikit.min.js", "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 054d7ff..7b2b3c6 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 054d7ff51e7817332490bac55b6bfd3cf2f1e391 +Subproject commit 7b2b3c6cc4222ce087ba5417deae0c30adeffa5b diff --git a/src/assets/common-assets b/src/assets/common-assets index 4f534fc..77039ce 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 4f534fc826ffbb6b0d3a8ddd47225f744dc3c1b8 +Subproject commit 77039ce35b10da86cbaee1215eb045b3d21c9bfd diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5e8c1ad..2e308b3 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 +Subproject commit 2e308b336682f993c8cdef369d36c3e2f32271f1 From 3ede45600c485797d81b6d115a5a7ea9fe6e32f1 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 21 Dec 2023 14:50:54 +0200 Subject: [PATCH 4/4] Change class for indicator-description to indicator overlay and improt it from indicators.less --- src/app/monitor/monitor.component.html | 2 +- src/app/monitor/monitor.component.less | 17 ----------------- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 6733d43..a97989d 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -223,7 +223,7 @@
+ class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
diff --git a/src/app/monitor/monitor.component.less b/src/app/monitor/monitor.component.less index c50e616..6bdfc05 100644 --- a/src/app/monitor/monitor.component.less +++ b/src/app/monitor/monitor.component.less @@ -5,20 +5,3 @@ opacity: 0.5; } } - -.indicator-description { - position: absolute; - top: 0; - left: 0; - background: @global-overlay-background; - width: 100%; - height: 100%; - - .inner { - background: @global-background; - border-radius: @global-border-radius; - width: 75%; - max-height: 75%; - overflow: auto; - } -} diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 7b2b3c6..41adaa3 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 7b2b3c6cc4222ce087ba5417deae0c30adeffa5b +Subproject commit 41adaa308d96de18d14a7113ab7dd706c110044a diff --git a/src/assets/common-assets b/src/assets/common-assets index 77039ce..1979f5e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 77039ce35b10da86cbaee1215eb045b3d21c9bfd +Subproject commit 1979f5ec89ca960bf7c927a933a160854ae680b3 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2e308b3..df6a052 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2e308b336682f993c8cdef369d36c3e2f32271f1 +Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6