From b3b8d46aa3a96e176cab9c56b2769ac3b746a94f Mon Sep 17 00:00:00 2001 From: Tykayn Date: Sun, 14 Nov 2021 15:48:27 +0100 Subject: [PATCH] styles for steps --- .../advanced-config.component.html | 1 - .../base-config/base-config.component.scss | 2 +- .../steps/step-five/step-five.component.html | 22 ++--- .../steps/step-four/step-four.component.html | 9 +- .../steps/step-four/step-four.component.scss | 8 ++ .../steps/step-one/step-one.component.html | 21 ++-- .../steps/step-two/step-two.component.scss | 7 +- .../success/success.component.html | 99 ++++++++++--------- .../success/success.component.scss | 3 +- src/styles/partials/_forms.scss | 25 ++++- src/styles/partials/_main.scss | 16 +-- 11 files changed, 112 insertions(+), 101 deletions(-) diff --git a/src/app/features/administration/form/advanced-config/advanced-config.component.html b/src/app/features/administration/form/advanced-config/advanced-config.component.html index d00c48af..04610dd2 100644 --- a/src/app/features/administration/form/advanced-config/advanced-config.component.html +++ b/src/app/features/administration/form/advanced-config/advanced-config.component.html @@ -1,6 +1,5 @@
-

{{ 'creation.advanced' | translate }}


-
- 300 caractères maximum -
- -
- + {{ pollService.form.value.description.length }} / 300 caractères maximum +
diff --git a/src/app/features/administration/form/steps/step-two/step-two.component.scss b/src/app/features/administration/form/steps/step-two/step-two.component.scss index 182a819e..dea15f78 100644 --- a/src/app/features/administration/form/steps/step-two/step-two.component.scss +++ b/src/app/features/administration/form/steps/step-two/step-two.component.scss @@ -1,3 +1,6 @@ -.fa { - margin-right: 1em; +.kind-of-poll { + margin-top: 5em; + .fa { + margin-right: 1em; + } } diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html index a52a4195..0076de43 100644 --- a/src/app/features/administration/success/success.component.html +++ b/src/app/features/administration/success/success.component.html @@ -15,52 +15,61 @@
-
+
-
-

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

-

- Voici les liens d’accès au sondage, conservez-les soigneusement ! (Si vous les perdez vous pourrez - toujours les recevoir par email) -

-

- Côté admin -

-

- Pour accéder au sondage et à tous ses paramètres : -
- {{ pollService.getAdministrationUrlFromForm() }} - - -

-
- - Voir le sondage coté administrateur·ice - -
-

- Note : Le sondage sera supprimé {{ pollService.form.value.default_expiracy_days_from_now }} jours - après la date de sa dernière modification. - - Le {{ pollService.form.value.expiracy_date | date: 'short' }} - -

-
-
-

{{ 'resume.users' | translate }}

-

- Pour voir le sondage : -
- {{ pollService.getParticipationUrlFromForm() }} - -

-
- -
+
+
+
+

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

+

+ Voici les liens d’accès au sondage, conservez-les soigneusement ! (Si vous les perdez vous + pourrez toujours les recevoir par email) +

+
+ Pour accéder au sondage et à tous ses paramètres : +
+ 
{{ pollService.getAdministrationUrlFromForm() }}
+
+ +
+
+ + Voir le sondage coté administrateur·ice + +
+

+ Note : Le sondage sera supprimé + {{ pollService.form.value.default_expiracy_days_from_now }} jours après la date de sa + dernière modification. + + Le {{ pollService.form.value.expiracy_date | date: 'short' }} + +

+
+
+
+
+

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

+

+ Pour voir le sondage : +
+ {{ pollService.getParticipationUrlFromForm() }} + +

+
+ +
+
+
diff --git a/src/app/features/administration/success/success.component.scss b/src/app/features/administration/success/success.component.scss index 80cd3a06..f354ac03 100644 --- a/src/app/features/administration/success/success.component.scss +++ b/src/app/features/administration/success/success.component.scss @@ -7,7 +7,8 @@ button { margin-right: 1ch; } a { - max-width: 35em; + padding: 1em; + max-width: 20em; @extend .truncate; } .truncate { diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss index 50346db9..3bc729e9 100644 --- a/src/styles/partials/_forms.scss +++ b/src/styles/partials/_forms.scss @@ -1,13 +1,32 @@ @charset "UTF-8"; - +.input:hover, +input:hover, +select:hover, +.textarea:hover, +.select select:hover, +.is-hovered.input, +input.is-hovered, +select.is-hovered, +.is-hovered.textarea, +.select select.is-hovered { + border-color: $border-color !important; +} app-step-one, app-step-two, app-step-three, -app-step-four, -app-step-five { +app-step-four { padding: 2em 2.5em; display: block; } +app-step-five { + app-stepper { + padding: 2em 2.5em; + display: block; + } + .container { + padding: 2em; + } +} input, select, diff --git a/src/styles/partials/_main.scss b/src/styles/partials/_main.scss index 459c2cfd..7c84f5e3 100644 --- a/src/styles/partials/_main.scss +++ b/src/styles/partials/_main.scss @@ -5,22 +5,8 @@ main { width: 100%; margin: 0 auto; } -.main-block { - min-height: 20em; - max-width: 40em; - margin-bottom: 10em; - margin-left: auto; - margin-right: auto; - .title { - margin-top: 2em; - margin-bottom: 2em; - } - .button { - border: 0; - } -} .creation, .search { - @extend .main-block; + @extend main; }