diff --git a/connect/community/CustomizationOptions.ts b/connect/community/CustomizationOptions.ts index f1a318d6..3cb0d7da 100644 --- a/connect/community/CustomizationOptions.ts +++ b/connect/community/CustomizationOptions.ts @@ -23,6 +23,7 @@ export class Layout { variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color); variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none'); variables['@hero-background-position'] = options.backgrounds.form.position; + variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode?'dark':'light'; } if (options.buttons) { //general @@ -106,6 +107,7 @@ export class CustomizationOptions { imageUrl: string; imageFile: string; position: string; + fontsDarkMode:boolean; } }; buttons: { @@ -132,7 +134,8 @@ export class CustomizationOptions { color: CustomizationOptions.getRGBA(this.identity.mainColor, 0.15), imageUrl: null, imageFile: null, - position: null + position: null, + fontsDarkMode: true } }; @@ -194,6 +197,9 @@ export class CustomizationOptions { if (!current.backgrounds.form.position) { current.backgrounds.form.position = "center bottom" } + if (!current.backgrounds.form.fontsDarkMode) { + current.backgrounds.form.fontsDarkMode = true; + } if (!current.buttons) { current.buttons = Object.assign({}, updated.buttons); } diff --git a/searchPages/searchUtils/portal-search-result.component.html b/searchPages/searchUtils/portal-search-result.component.html index 8a20d567..9c202293 100644 --- a/searchPages/searchUtils/portal-search-result.component.html +++ b/searchPages/searchUtils/portal-search-result.component.html @@ -3,7 +3,7 @@
  • + [ngClass]="result.type" [class.noColor]="properties.adminToolsPortalType == 'connect'" [class.uk-disabled]="!hasPermission(result)">
    Member
    @@ -49,7 +49,7 @@
    -

    +

    {{result.description | htmlToString}}

    diff --git a/searchPages/searchUtils/portal-search-result.component.less b/searchPages/searchUtils/portal-search-result.component.less index e43a61fd..a631ad17 100644 --- a/searchPages/searchUtils/portal-search-result.component.less +++ b/searchPages/searchUtils/portal-search-result.component.less @@ -11,15 +11,15 @@ @media(min-width: @breakpoint-medium) { .uk-card { - &.funder { + &.funder:not(.noColor) { .setType(@funder-color); } - &.ri { + &.ri:not(.noColor) { .setType(@ri-color); } - &.organization { + &.organization:not(.noColor) { .setType(@organization-color); } } @@ -27,15 +27,15 @@ @media(max-width: @breakpoint-small-max) { .uk-card { - &.funder { + &.funder:not(.noColor) { .setType(@funder-color, bottom); } - &.ri { + &.ri:not(.noColor) { .setType(@ri-color, bottom); } - &.organization { + &.organization:not(.noColor) { .setType(@organization-color, bottom); } } diff --git a/searchPages/searchUtils/portal-search-result.module.ts b/searchPages/searchUtils/portal-search-result.module.ts index ce1ebcf2..96a31172 100644 --- a/searchPages/searchUtils/portal-search-result.module.ts +++ b/searchPages/searchUtils/portal-search-result.module.ts @@ -11,12 +11,13 @@ import {UrlPrefixModule} from "../../utils/pipes/url-prefix.module"; import {IconsService} from "../../utils/icons/icons.service"; import {incognito, restricted} from "../../utils/icons/icons"; import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module"; +import {HTMLToStringPipeModule} from "../../utils/pipes/HTMLToStringPipe.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, - AlertModalModule, ManageModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule + AlertModalModule, ManageModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, HTMLToStringPipeModule ], declarations: [ PortalSearchResultComponent diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 868e2e97..cacc7cb1 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,5 +1,5 @@ export type Environment = "development" | "test" | "beta" | "production"; -export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc"; +export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "client-management-portal"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc"; export interface EnvProperties {