From f19b3026d9520f077fb2da161a7e7fa00cdd3054 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 14 Mar 2022 18:40:13 +0200 Subject: [PATCH 1/2] Change variables after refactor in new theme. Fix icons in learn-how --- .../communities/communities.component.html | 14 +++++----- src/app/learn-how/learn-how.component.ts | 26 +++++++++++++++---- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/connect-custom.css | 20 +++++--------- src/assets/openaire-theme | 2 +- 6 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index dc15ae0..d65dea2 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -82,9 +82,9 @@
- -
+

Benefits

Find the best
for your community.

@@ -109,34 +109,34 @@
-
+

Find a repository to
deposit your research
outcome .

-
+

Link your research
output with your
community, funding,
and other research
products .

-
+

View community's
 overview at a glance.

-
+

Search & browse your
community's research
products .

-
+

View statistics for
your community's
research products diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 85df3a7..6f9aee0 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -8,6 +8,7 @@ import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; import {Subscriber} from "rxjs"; import {properties} from "../../environments/environment"; +import {TabIcon} from "../openaireLibrary/utils/tabs/tab.component"; @Component({ selector: 'learn-how', @@ -274,11 +275,26 @@ export class LearnHowComponent implements OnInit { public divContents = null; // public step: string = 'all'; - public aboutAll = ''; - public about1 = ''; - public about2 = ''; - public about3 = ''; - public about4 = ''; + public aboutAll: TabIcon = { + svg: '', + active: 'uk-text-primary' + }; + public about1: TabIcon = { + svg: '', + active: 'uk-text-primary' + }; + public about2: TabIcon = { + svg: '', + active: 'uk-text-primary' + }; + public about3: TabIcon = { + svg: '', + active: 'uk-text-primary' + }; + public about4: TabIcon = { + svg: '', + active: 'uk-text-primary' + }; public url: string = null; public pageTitle: string = "OpenAIRE - Connect | Learn How"; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 2542d45..4ccabce 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2542d452be89e0ad740978d889e1a0f3e05c302f +Subproject commit 4ccabced6dd8624a0c7cde617891cca4d10e0751 diff --git a/src/assets/common-assets b/src/assets/common-assets index 4e99b08..b7ebcb7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 4e99b0887c758579682eb1d9848d227e18f97799 +Subproject commit b7ebcb75131a4bd5fc956f540c19f3ed4bedba1b diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css index 30c7520..5f1ac91 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.css @@ -8,16 +8,16 @@ Custom connect css --button-primary-background-image: none; --button-secondary-background: var(--secondary-color); --button-secondary-background-image: none; - --button-primary-color: var(--font-default-color); + --button-primary-color: var(--text-default-color); /*backgrounds*/ - --primary-background: #2C2C2C; - --primary-background-image:none; - --secondary-background-image:none; + --background-primary: var(--connect-color); + --background-primary-image:none; + --background-secondary: var(--grey-color); + --background-secondary-image:none; /*fonts*/ - --font-primary-color:var(--connect-color); - /*--secondary-background: var(--secondary-color);*/ + --text-primary-color:var(--connect-color); } /*.whiteBackground { @@ -247,14 +247,6 @@ Custom connect css /*}*/ -.connectApp .custom-main-content { - background-color: #F9F9F9 !important; -} - -main { - min-height: calc(100vh - 100px); -} - /*.connectApp .login text {*/ /* stroke: black;*/ /* fill: black;*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index a6fbd5f..de51fea 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit a6fbd5fdba27493d9b5bd59d92b632f08c7dbb96 +Subproject commit de51fea2dd3c8a64fc3c68ed29a9aa8f71034a54 From 5597d5ff7d7bd7d45a90abd0f419b9809462e31d Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 16 Mar 2022 19:13:43 +0200 Subject: [PATCH 2/2] add stepper css, add default button variables --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4ccabce..b027575 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4ccabced6dd8624a0c7cde617891cca4d10e0751 +Subproject commit b027575fc0e300b6bc704b5af31a391fe83ebe72 diff --git a/src/assets/common-assets b/src/assets/common-assets index b7ebcb7..776ba07 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b7ebcb75131a4bd5fc956f540c19f3ed4bedba1b +Subproject commit 776ba07197e4cf73e98890bd4213a32183ea19d2 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index de51fea..7e2effb 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit de51fea2dd3c8a64fc3c68ed29a9aa8f71034a54 +Subproject commit 7e2effb016145b38c8fda111dd474148f1e9be72