Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
300002ac56
|
@ -3,7 +3,7 @@
|
|||
<errorMessages [status]="[status]" [type]="'results'"></errorMessages>
|
||||
<li *ngFor="let result of results">
|
||||
<div class="uk-card uk-card-default uk-position-relative uk-flex uk-flex-column uk-flex-center"
|
||||
[ngClass]="result.type" [class.uk-disabled]="!hasPermission(result)">
|
||||
[ngClass]="result.type" [class.noColor]="properties.adminToolsPortalType == 'connect'" [class.uk-disabled]="!hasPermission(result)">
|
||||
<div *ngIf="type === 'community' && result.isSubscribed" [class.uk-position-top-left]="!isMobile" [class.uk-position-top-right]="isMobile" class="uk-text-background uk-text-center uk-padding-small uk-text-uppercase uk-text-bold">
|
||||
<span>Member</span>
|
||||
</div>
|
||||
|
@ -49,7 +49,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div *ngIf="result.description && !isMobile" class="uk-margin-top uk-text-small multi-line-ellipsis lines-3">
|
||||
<p class="uk-text-meta" [innerHTML]="result.description"></p>
|
||||
<p class="uk-text-meta" >{{result.description | htmlToString}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-1-5@m uk-width-1-3 uk-flex-first@m">
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue