From 2683abba2acfe3018022face06df38ab333fdb68 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Fri, 17 Dec 2021 17:47:57 +0100 Subject: [PATCH] i18n on stepper --- .../features/administration/stepper/stepper.component.html | 2 +- .../features/administration/stepper/stepper.component.scss | 6 ++++-- .../features/administration/stepper/stepper.component.ts | 3 +-- src/assets/i18n/EN.json | 2 +- src/styles/partials/_datepicker.scss | 6 +++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html index f0d12156..a31f5ee7 100644 --- a/src/app/features/administration/stepper/stepper.component.html +++ b/src/app/features/administration/stepper/stepper.component.html @@ -118,7 +118,7 @@ Fermer -

+

{{ 'popup.cancel.title' | translate }}

diff --git a/src/app/features/administration/stepper/stepper.component.scss b/src/app/features/administration/stepper/stepper.component.scss index 9f07cd54..4bd5fef1 100644 --- a/src/app/features/administration/stepper/stepper.component.scss +++ b/src/app/features/administration/stepper/stepper.component.scss @@ -77,7 +77,7 @@ .cancel-button-reject-bottom { background: $secondary_color; color: $white; - margin-left: 2rem; + margin-left: 1rem; } .step-info { @@ -113,14 +113,16 @@ } .cancel-button-reject { background: none; - color: $secondary_color; + color: $primary_color; margin-right: -1rem; i { + color: $primary_color; margin-left: 1ch; } } .cancel-button-confirm { color: $secondary_color; + margin-right: 0; } } diff --git a/src/app/features/administration/stepper/stepper.component.ts b/src/app/features/administration/stepper/stepper.component.ts index 5f2c7a53..c26b91de 100644 --- a/src/app/features/administration/stepper/stepper.component.ts +++ b/src/app/features/administration/stepper/stepper.component.ts @@ -18,8 +18,7 @@ export class StepperComponent { @Input() public step_max: number = 5; public environment = environment; - public show_shortcuts = environment.showStepperShortcuts; - display_cancel_dialog: boolean = true; + display_cancel_dialog: boolean = false; constructor( public pollService: PollService, diff --git a/src/assets/i18n/EN.json b/src/assets/i18n/EN.json index 092abebf..61f53d4e 100644 --- a/src/assets/i18n/EN.json +++ b/src/assets/i18n/EN.json @@ -40,7 +40,7 @@ "classic": "classic", "date": "special dates" }, - "choose_title": "Whom title will be", + "choose_title": "Provide a name for your poll", "choose_title_placeholder": "title", "name": "I can also specify my name if i want", "name_placeholder": "my name", diff --git a/src/styles/partials/_datepicker.scss b/src/styles/partials/_datepicker.scss index 92f0686d..56ccb509 100644 --- a/src/styles/partials/_datepicker.scss +++ b/src/styles/partials/_datepicker.scss @@ -9,7 +9,11 @@ p-calendar, width: 100%; max-width: 90vw; } - +.p-dialog { + .title { + color: $primary_color; + } +} .p-datepicker { padding: 0.5em; margin: 1em auto;