From 1530ce60ec0c6ebbf6d5a4e758a95f5bda710c11 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 30 Sep 2022 14:51:00 +0300 Subject: [PATCH] [Eosc Explore]: Updated some styles | Replaced "datasourcetypeuiname" field with "eoscdatasourcetype" | Do not add hardcoded compatibility label "Not yet registered" | Bug fix in Access filter 1. styles.less: Renamed from styles.css and added imports of less files and portal-custom.css (to be updated). 2. angular.json: In styles configuration added styles.less. 3. index.html & beta/index.html: In beta badge, used background instead of background-color to css rules. 4. portal-custom.css: Added rule for .search-form to inherit color in background. 5. searchFields.ts: a. Replaced "datasourcetypeuiname" field with "eoscdatasourcetype" for datasources refine filter "Type". b. In method "getResultAdvancedFields()" return always RESULT_ADVANCED_FIELDS without excluding "eoscifguidelines". 6. datasourcesHelper.class.ts: Replaced "datasourcetypeuiname" field with "eoscdatasourcetype" for datasources queries and used updated type names "Research Entity Registry" (old "Registry") and "Journal Archive" (old "Journal archive"). 7. cache-interceptor.service.ts: Updated cachingRequests array, using new "eoscdatasourcetype" and its values. 8. dataProvider.component.html && result-preview.component.html: Do not add hardcoded compatibility label "Not yet registered" and updated checks. 9. resultLanding.service.ts & parsingFunctions.class.ts: Parse resultLandingInfo.eoscSubjects only by "eoscifguidelines" field not "subjects". 10. searchFilter.component.ts: [Bug fix] In Access filter, fixed bug in view all, when clearing the preselected value. * Do not forget to add in package.json in devDependencies, "@types/express-serve-static-core": "4.17.28" --- angular.json | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/portal-custom.css | 5 +++++ src/beta/index.html | 2 +- src/index.html | 2 +- src/styles.css | 4 ---- src/styles.less | 12 ++++++++++++ 7 files changed, 22 insertions(+), 9 deletions(-) delete mode 100644 src/styles.css create mode 100644 src/styles.less diff --git a/angular.json b/angular.json index ea31ee4..bca2ab8 100644 --- a/angular.json +++ b/angular.json @@ -46,7 +46,7 @@ "src/robots.txt" ], "styles": [ - "src/styles.css", + "src/styles.less", "src/material.scss" ], "scripts": [ @@ -182,7 +182,7 @@ "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", "styles": [ - "src/styles.css" + "src/styles.less" ], "scripts": [], "assets": [ diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 032b91a..a246608 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 032b91ae7a78ccad72a3a02a9463f6df5d00d223 +Subproject commit a2466083683df7dfafb074221b27189bfbed9565 diff --git a/src/assets/portal-custom.css b/src/assets/portal-custom.css index 9e650dd..6dc0cec 100644 --- a/src/assets/portal-custom.css +++ b/src/assets/portal-custom.css @@ -68,3 +68,8 @@ .number { color: #1d1d1d; } + +.search-form { + background-color: inherit !important; + background-image: none !important; +} \ No newline at end of file diff --git a/src/beta/index.html b/src/beta/index.html index 58bad9a..2a66f91 100644 --- a/src/beta/index.html +++ b/src/beta/index.html @@ -42,7 +42,7 @@ EOSC Explore -
Beta instance
+
Beta instance
diff --git a/src/index.html b/src/index.html index cb3c6e4..2d005f6 100644 --- a/src/index.html +++ b/src/index.html @@ -43,7 +43,7 @@ Search OpenAIRE -
Beta instance
+
Beta instance
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..ebb671c --- /dev/null +++ b/src/styles.less @@ -0,0 +1,12 @@ +///* 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"; + +/* 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 "~src/assets/common-assets/less/linking"; +@import "~src/assets/common-assets/less/landing"; +@import "assets/portal-custom.css"; \ No newline at end of file