diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 03d9e979..3de7e7fc 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -126,7 +126,7 @@ export class PollService implements Resolve { choices: new FormArray([]), whoModifiesAnswers: ['self', [Validators.required]], whoCanChangeAnswers: ['self', [Validators.required]], - isAboutDate: [false, [Validators.required]], + isAboutDate: [true, [Validators.required]], expiresDaysDelay: [environment.expiresDaysDelay, []], expiracy_date: [this.DateUtilitiesService.addDaysToDate(environment.expiresDaysDelay, new Date()), []], isZeroKnoledge: [false, [Validators.required]], diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.html b/src/app/features/administration/form/steps/step-three/step-three.component.html index eb78cce8..31f4657d 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.html +++ b/src/app/features/administration/form/steps/step-three/step-three.component.html @@ -5,7 +5,7 @@
-

+

{{ 'dates.title' | translate }}

diff --git a/src/app/features/administration/form/steps/step-three/step-three.component.scss b/src/app/features/administration/form/steps/step-three/step-three.component.scss index fa39faa6..ccf19b08 100644 --- a/src/app/features/administration/form/steps/step-three/step-three.component.scss +++ b/src/app/features/administration/form/steps/step-three/step-three.component.scss @@ -19,3 +19,6 @@ color: $white; } } +.date-input-selector { + padding: 0.5rem 1rem; +} diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index c6f4c186..ea113b9d 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -154,7 +154,7 @@ "owner": { "title": "Say to your guests who you are !", "name_label": "Your name (required)", - "email_label": "Your e-mail (required)", + "email_label": "Your e-mail", "email_description": "Your email will not be used for anything else than sending you notifications." }, "resume": { diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index 1c5829a0..176ff1e9 100755 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -159,7 +159,7 @@ "owner": { "title": "Dites à vos participants qui vous êtes !", "name_label": "Votre nom (obligatoire)", - "email_label": "Votre adresse e-mail (obligatoire)", + "email_label": "Votre adresse e-mail", "email_description": "Votre adresse ne sera pas partagée avec les participants du sondage. Elle nous sert uniquement à vous informer des mises à jours et vous prévenir dès qu’un nouveau vote à eu lieu." }, "resume": { diff --git a/src/styles/partials/_datepicker.scss b/src/styles/partials/_datepicker.scss index 9c7e2750..71f8c1e2 100644 --- a/src/styles/partials/_datepicker.scss +++ b/src/styles/partials/_datepicker.scss @@ -9,13 +9,15 @@ p-calendar, width: 100%; max-width: 90vw; } + .p-dialog { .title { color: $primary_color; } } + .p-datepicker { - padding: 0.5em; + padding: 0 !important; margin: 1em auto; border: 0; @@ -28,13 +30,28 @@ p-calendar, text-align: center; } + .p-datepicker-header { + padding: 0 !important; + button.p-datepicker-prev, + button.p-datepicker-next { + border: solid 1px $d-primary !important; + border-radius: 0.25rem !important; + width: 54px !important; + height: 54px !important; + } + } + .p-datepicker-title, .p-datepicker-calendar thead tr th span { - color: $primary_color !important; + color: $d-primary-intense; text-align: center; width: 100%; display: block; } + .p-datepicker-calendar thead tr th span { + color: $d-primary; + font-weight: normal; + } p-button, button { @@ -57,6 +74,7 @@ p-calendar, .p-datepicker-month { margin-right: 1em; + color: $d-primary-intense; } .p-datepicker-weeknumber span { @@ -91,6 +109,7 @@ p-calendar, color: $white; transition: all ease 0.2s; } + &.p-disabled { @extend .striked-background; } @@ -130,6 +149,7 @@ p-calendar, width: 50%; } } + .p-datepicker-header, .p-datepicker .p-datepicker-buttonbar { border: 0 !important; diff --git a/src/styles/partials/global.scss b/src/styles/partials/global.scss index 4c01bb91..2e5bfe7f 100644 --- a/src/styles/partials/global.scss +++ b/src/styles/partials/global.scss @@ -27,6 +27,7 @@ main { .min-height { margin-bottom: 1em; min-height: 50vh; + overflow-x: hidden; } .content { @@ -57,37 +58,7 @@ main { padding: 0; .column { - // padding: 0; width: 50% !important; - // float: left; - // - // &:nth-of-type(1) { - // padding-right: 1.5rem; - // - // .step-info & { - // padding: 0; - // } - // } - // - // &:nth-of-type(2) { - // padding-left: 1.5rem; - // } - // - // &.is-fullwidth { - // width: 100% !important; - // padding-right: 0 !important; - // - // .button:nth-of-type(1) { - // width: 50%; - // float: right; - // } - // } - //} - // - //.button { - // .is-half-offseted { - // float: right; - // } } } }