diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html index 5b671a0a..dcddfde3 100644 --- a/claims/linking/linkingGeneric.component.html +++ b/claims/linking/linkingGeneric.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 18bde834..a301ffac 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -6,7 +6,7 @@ export class ConnectHelper { public static getCommunityFromDomain(domain: string): string{ if(properties.environment == "development") { - domain = "covid-19.openaire.eu"; //for testing + // domain = "covid-19.openaire.eu"; //for testing } domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix if (domain.indexOf('eosc-portal.eu') != -1) { diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html index 8ec71952..11285a71 100644 --- a/contact-us/contact-us.component.html +++ b/contact-us/contact-us.component.html @@ -1,8 +1,8 @@

{{formTitle}}

-
+
-
+
@@ -121,4 +121,4 @@ (searchPageUpdates)="activeEntityUpdate($event)" simpleSearchLink="/search/find" [customFilter]="customFilter" type="services" entityType="service" [typeName]="openaireEntities.SERVICES"> - \ No newline at end of file + diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 3f4c7a8d..f64a4f44 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -130,7 +130,7 @@
-
+
diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 42e48bff..77cb3d35 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -44,7 +44,7 @@ [queryParams]="menu.rootItem.params" [fragment]="menu.rootItem.fragment">{{menu.rootItem.title}} {{menu.rootItem.title}} {{submenu.title}} {{submenu.title}}
    @@ -68,7 +68,7 @@ routerLink="{{subsubmenu.route}}" [queryParams]="subsubmenu.params" [fragment]="subsubmenu.fragment" (click)="closeCanvas(canvas)">{{subsubmenu.title}} {{subsubmenu.title}} @@ -140,7 +140,7 @@ [fragment]="menu.rootItem.fragment"> {{menu.rootItem.title}} + [class.custom-external]="menu.rootItem.url.includes('http')">{{menu.rootItem.title}} {{menu.rootItem.title}}
    @@ -154,7 +154,7 @@ routerLink="{{submenu.route}}" [queryParams]="submenu.params" [fragment]="submenu.fragment">{{submenu.title}} {{submenu.title}}
      @@ -163,7 +163,7 @@ routerLink="{{subsubmenu.route}}" [queryParams]="subsubmenu.params" [fragment]="subsubmenu.fragment">{{subsubmenu.title}} {{subsubmenu.title}} + href="{{subsubmenu.url}}" class="custom-external" target="_blank">{{subsubmenu.title}}
    @@ -191,7 +191,7 @@ + target="_blank" class="custom-external"> {{menu.title}} @@ -216,7 +216,7 @@ + target="_blank" class="custom-external"> {{submenu.title}} @@ -250,7 +250,7 @@ {{item.title}} diff --git a/sharedComponents/quick-contact/quick-contact.component.css b/sharedComponents/quick-contact/quick-contact.component.css index 7c04d067..bbf6017c 100644 --- a/sharedComponents/quick-contact/quick-contact.component.css +++ b/sharedComponents/quick-contact/quick-contact.component.css @@ -6,9 +6,9 @@ } .uk-dropdown { - max-height: 650px; + max-height: 550px; height: calc(80vh - 100px); - width: 500px; + width: 400px; max-width: 80vw; } diff --git a/sharedComponents/quick-contact/quick-contact.component.html b/sharedComponents/quick-contact/quick-contact.component.html index 6f23f233..612c66d9 100644 --- a/sharedComponents/quick-contact/quick-contact.component.html +++ b/sharedComponents/quick-contact/quick-contact.component.html @@ -1,17 +1,17 @@ -
    - +
    + +
    +
    Send a message
    -
    - - +
    +
    How can we help? diff --git a/sharedComponents/quick-contact/quick-contact.component.ts b/sharedComponents/quick-contact/quick-contact.component.ts index 3dc72e46..67adf85d 100644 --- a/sharedComponents/quick-contact/quick-contact.component.ts +++ b/sharedComponents/quick-contact/quick-contact.component.ts @@ -14,6 +14,12 @@ export class QuickContactComponent implements OnInit, OnDestroy { @Input() public contactForm: FormGroup; @Input() + public images: string[] = []; + @Input() + public contact: string = 'contact'; + @Input() + public background: string = 'uk-background-primary'; + @Input() public sending = false; @Input() public organizationTypes: string[] = []; @@ -48,7 +54,7 @@ export class QuickContactComponent implements OnInit, OnDestroy { } public close() { - UIkit.drop(this.drop.nativeElement).hide(); + UIkit.dropdown(this.drop.nativeElement).hide(); } public send(event) { diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index b7acc0b5..84f2d44a 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -16,9 +16,8 @@ declare var UIkit: any;
    -
    + [ngClass]="classBody" [attr.uk-overflow-auto]="overflowBody?'':null">