From 52e04d7b484a47e1b358dccefd1f72b2dd702113 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 12 Jan 2022 14:12:30 +0200 Subject: [PATCH] Change contact-us base on new theme. Change modal buttons. Changle default color of loading with uk-text-primary --- contact-us/contact-us.component.css | 4 -- contact-us/contact-us.component.html | 57 +++++++--------------------- contact-us/contact-us.component.ts | 3 +- contact-us/contact-us.module.ts | 3 +- utils/loading/loading.component.ts | 2 +- utils/modal/alert.ts | 16 ++++---- 6 files changed, 25 insertions(+), 60 deletions(-) delete mode 100644 contact-us/contact-us.component.css diff --git a/contact-us/contact-us.component.css b/contact-us/contact-us.component.css deleted file mode 100644 index 16bdb90c..00000000 --- a/contact-us/contact-us.component.css +++ /dev/null @@ -1,4 +0,0 @@ -.uk-text-danger { - color: #b50000!important; - font-size: 12px; -} diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html index d63cfd4d..bf81c78b 100644 --- a/contact-us/contact-us.component.html +++ b/contact-us/contact-us.component.html @@ -1,82 +1,53 @@

{{formTitle}}

+
-
- *Required fields -
-
- Name * -
- +
-
- Surname * -
-
-
- Email * -
-
-
- Job Title * -
-
-
- Affiliation * -
-
-
-
Research Community or Infrastructure *
-
-
-
Organization *
-
-
Organization Type *
-
Subject *
-
-
- Message * -
-
-
- Description * -
-
@@ -85,6 +56,6 @@
- +
diff --git a/contact-us/contact-us.component.ts b/contact-us/contact-us.component.ts index 81b8b40a..ebbdc9b1 100644 --- a/contact-us/contact-us.component.ts +++ b/contact-us/contact-us.component.ts @@ -6,8 +6,7 @@ import {map, startWith} from "rxjs/operators"; @Component({ selector: 'contact-us', - templateUrl: './contact-us.component.html', - styleUrls: ['contact-us.component.css'] + templateUrl: './contact-us.component.html' }) export class ContactUsComponent { diff --git a/contact-us/contact-us.module.ts b/contact-us/contact-us.module.ts index 7fecbb41..21def708 100644 --- a/contact-us/contact-us.module.ts +++ b/contact-us/contact-us.module.ts @@ -6,11 +6,12 @@ import {ContactUsComponent} from './contact-us.component'; import {ReactiveFormsModule} from "@angular/forms"; import {MatAutocompleteModule} from "@angular/material/autocomplete"; import {RecaptchaModule} from "ng-recaptcha"; +import {SafeHtmlPipeModule} from "../utils/pipes/safeHTMLPipe.module"; @NgModule({ imports: [ CommonModule, RouterModule, - ReactiveFormsModule, MatAutocompleteModule, RecaptchaModule], + ReactiveFormsModule, MatAutocompleteModule, RecaptchaModule, SafeHtmlPipeModule], declarations: [ ContactUsComponent ], diff --git a/utils/loading/loading.component.ts b/utils/loading/loading.component.ts index 8477e095..154229df 100644 --- a/utils/loading/loading.component.ts +++ b/utils/loading/loading.component.ts @@ -22,7 +22,7 @@ import {Component, Input, OnInit} from "@angular/core"; ` }) export class LoadingComponent implements OnInit { - @Input() color: string = 'portal-color'; + @Input() color: string = 'uk-text-primary'; @Input() full: boolean = false; @Input() top_margin: boolean = true; @Input() size: "small" | "medium" | "large" = "large"; diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 4cfcad6f..26874463 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -24,16 +24,14 @@ declare var UIkit: any; Don't show this message again
-
- - - +
+ + - -