From 71d00f564243fbbaa71cedd1b77ef4f14b96de92 Mon Sep 17 00:00:00 2001 From: bsatarnejad Date: Tue, 29 Sep 2020 16:33:10 +0200 Subject: [PATCH 1/2] changes in styles --- frontend/src/global_styles/content/_forms.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/global_styles/content/_forms.sass b/frontend/src/global_styles/content/_forms.sass index e231620259..a453612692 100644 --- a/frontend/src/global_styles/content/_forms.sass +++ b/frontend/src/global_styles/content/_forms.sass @@ -472,7 +472,7 @@ fieldset.form--fieldset .form--field-instructions @extend %form--field-after-container font-style: italic - max-width: 500px + width: min-content // improve readability &.-no-margin From ee3402c46a0766828c603a1c6e252ae89c035fac Mon Sep 17 00:00:00 2001 From: bsatarnejad Date: Thu, 1 Oct 2020 09:31:47 +0200 Subject: [PATCH 2/2] add a sass file for component styles --- .../enterprise-trial-form/ee-trial-form.component.html | 2 +- .../enterprise-trial-form/ee-trial-form.component.sass | 2 ++ .../enterprise-trial-form/ee-trial-form.component.ts | 3 ++- frontend/src/global_styles/content/_forms.sass | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.sass diff --git a/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.html b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.html index 19c770089a..317d2df711 100644 --- a/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.html +++ b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.html @@ -43,7 +43,7 @@ formControlName="email" (blur)="checkMailField()"> -
{{ eeTrialService.errorMsg }}
+
diff --git a/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.sass b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.sass new file mode 100644 index 0000000000..c7073ae97f --- /dev/null +++ b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.sass @@ -0,0 +1,2 @@ +.ee-trial-email-error + width: min-content \ No newline at end of file diff --git a/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts index 634d75fc0d..1eda5e98ed 100644 --- a/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts +++ b/frontend/src/app/components/enterprise/enterprise-modal/enterprise-trial-form/ee-trial-form.component.ts @@ -37,7 +37,8 @@ const newsletterURL = 'https://www.openproject.com/newsletter/'; @Component({ selector: 'enterprise-trial-form', - templateUrl: './ee-trial-form.component.html' + templateUrl: './ee-trial-form.component.html', + styleUrls: ['./ee-trial-form.component.sass'] }) export class EETrialFormComponent { // Retain used values diff --git a/frontend/src/global_styles/content/_forms.sass b/frontend/src/global_styles/content/_forms.sass index a453612692..e231620259 100644 --- a/frontend/src/global_styles/content/_forms.sass +++ b/frontend/src/global_styles/content/_forms.sass @@ -472,7 +472,7 @@ fieldset.form--fieldset .form--field-instructions @extend %form--field-after-container font-style: italic - width: min-content + max-width: 500px // improve readability &.-no-margin