From 4f5f8df077db45713393807cf3e3b8ccabe8ed27 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Thu, 10 Mar 2022 13:13:42 +0100 Subject: [PATCH] remove column and container in resume step --- src/app/core/services/poll.service.ts | 2 +- .../steps/step-four/step-four.component.html | 6 +- .../steps/step-four/step-four.component.scss | 5 + .../step-seven/step-seven.component.html | 182 +++++++++--------- src/styles/libraries/_overrides.scss | 3 + 5 files changed, 100 insertions(+), 98 deletions(-) diff --git a/src/app/core/services/poll.service.ts b/src/app/core/services/poll.service.ts index 6906a910..d6f11d85 100644 --- a/src/app/core/services/poll.service.ts +++ b/src/app/core/services/poll.service.ts @@ -50,7 +50,7 @@ export class PollService implements Resolve { public showDateInterval = false; public allowSeveralHours = false; public richTextMode = false; - public mode_calendar = false; // default input to select dates in creation step + public mode_calendar = true; // default input to select dates in creation step public calendar: Date[] = [new Date()]; public disabled_dates: Date[] = []; diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html index 5e3f494e..566f23dc 100644 --- a/src/app/features/administration/form/steps/step-four/step-four.component.html +++ b/src/app/features/administration/form/steps/step-four/step-four.component.html @@ -94,7 +94,7 @@ {{ 'hours.modal.title' | translate }}
-
+
@@ -147,7 +147,7 @@ > {{ 'hours.modal.validate' | translate }} -
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.scss b/src/app/features/administration/form/steps/step-four/step-four.component.scss index 872bb23c..53e81653 100644 --- a/src/app/features/administration/form/steps/step-four/step-four.component.scss +++ b/src/app/features/administration/form/steps/step-four/step-four.component.scss @@ -66,3 +66,8 @@ height: 40px; } } +#add_time_button { + padding-left: 40px; + background-position: left; + background-size: 20px 20px; +} diff --git a/src/app/features/administration/form/steps/step-seven/step-seven.component.html b/src/app/features/administration/form/steps/step-seven/step-seven.component.html index e9135d71..4ee8fe1f 100644 --- a/src/app/features/administration/form/steps/step-seven/step-seven.component.html +++ b/src/app/features/administration/form/steps/step-seven/step-seven.component.html @@ -1,103 +1,97 @@
-
-
-

- {{ 'resume.title' | translate }} -

-

- {{ 'resume.description' | translate }} +

+ {{ 'resume.title' | translate }} +

+

+ {{ 'resume.description' | translate }} +

+
+

{{ 'resume.general' | translate }}

+
+

+ {{ pollService.form.value.title }} + + (pas de titre) + +

+

+ {{ pollService.form.value.description }} + + {{ 'resume.no_description' | translate }} +

-
-

{{ 'resume.general' | translate }}

-
-

- {{ pollService.form.value.title }} - - (pas de titre) - -

-

- {{ pollService.form.value.description }} - - {{ 'resume.no_description' | translate }} - -

-
-
- icone crayon - {{ 'resume.edit' | translate }} -
-
-

{{ 'resume.kind' | translate }}

-
- {{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }} -
-
- - {{ 'resume.edit' | translate }} -
-
-

{{ 'resume.dates_and_hours' | translate }}

-
-
-
    +
    +
    + icone crayon + {{ 'resume.edit' | translate }} +
    +
+

{{ 'resume.kind' | translate }}

+
+ {{ pollService.form.value.isAboutDate ? 'Date' : 'Propositions' }} +
+
+ + {{ 'resume.edit' | translate }} +
+
+

{{ 'resume.dates_and_hours' | translate }}

+
+
+
    +
  • + + {{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris' }} + +
    • - - {{ choice.date_object | date: 'E d/M/yyy':'Europe/Paris' }} - -
        -
      • - {{ timeSlice.literal }} -
        • -
      + {{ timeSlice.literal }}
    -
-
-
    -
  • - {{ choice }} -
    • -
-
-
-
- - {{ 'resume.edit' | translate }} -
-
-

{{ 'resume.params_notifs' | translate }}

-
-
- Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }} -
-
-
- - {{ 'resume.edit' | translate }} -
-
-

{{ 'resume.owner' | translate }}

-
-
- - {{ 'SENTENCES.your-name' | translate }} - - {{ pollService.form.value.creatorPseudo }} -
- -
-
- - {{ 'resume.edit' | translate }} -
-
+ + +
+
+
    +
  • + {{ choice }} +
    • +
+
+
+
+ + {{ 'resume.edit' | translate }} +
+
+

{{ 'resume.params_notifs' | translate }}

+
+
Protégé par mot de passe: {{ pollService.form.value.password ? 'oui' : 'non' }}
+
+
+ + {{ 'resume.edit' | translate }} +
+
+

{{ 'resume.owner' | translate }}

+
+
+ + {{ 'SENTENCES.your-name' | translate }} + + {{ pollService.form.value.creatorPseudo }} +
+ +
+
+ + {{ 'resume.edit' | translate }}
diff --git a/src/styles/libraries/_overrides.scss b/src/styles/libraries/_overrides.scss index f9f4d52c..57c6f079 100644 --- a/src/styles/libraries/_overrides.scss +++ b/src/styles/libraries/_overrides.scss @@ -101,3 +101,6 @@ button .icon:first-child:last-child, .p-datepicker .p-datepicker-header .p-datepicker-next:focus { outline: 3px solid $outline-color !important; } +.p-button.p-button-text { + color: $primary-color; +}