From f958b012b98bf9746f81f8a78120037e7e9396d9 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Tue, 30 Nov 2021 18:27:50 +0100
Subject: [PATCH] title and label style

---
 .../step-seven/step-seven.component.html      |  7 +-
 .../steps/step-six/step-six.component.html    |  2 +-
 .../success/success.component.html            |  6 +-
 src/styles/partials/_forms.scss               |  1 +
 src/styles/partials/_typo.scss                | 79 ++++++++++---------
 5 files changed, 50 insertions(+), 45 deletions(-)

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 46fd851c..70999691 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
@@ -87,11 +87,8 @@
 					</button>
 				</div>
 				<div class="column">
-					<button
-						class="button is-finish is-fullwidth"
-						(click)="createPoll()"
-						[disabled]="!pollService.form.valid"
-					>
+					<button class="button is-finish is-fullwidth" (click)="createPoll()">
+						<!--						[disabled]="!pollService.form.valid"-->
 						<i class="fa fa-save"></i>
 						Enregistrer le sondage
 					</button>
diff --git a/src/app/features/administration/form/steps/step-six/step-six.component.html b/src/app/features/administration/form/steps/step-six/step-six.component.html
index 41d5d045..e5d51687 100644
--- a/src/app/features/administration/form/steps/step-six/step-six.component.html
+++ b/src/app/features/administration/form/steps/step-six/step-six.component.html
@@ -2,7 +2,7 @@
 	<app-stepper [step_current]="6" [step_max]="pollService.step_max"></app-stepper>
 	<div class="min-height">
 		<form action="#" [formGroup]="pollService.form">
-			<h2 class="title is-2">
+			<h2>
 				Dites à vos participants qui vous êtes !
 			</h2>
 			<label for="name">
diff --git a/src/app/features/administration/success/success.component.html b/src/app/features/administration/success/success.component.html
index ab944488..86aeeb34 100644
--- a/src/app/features/administration/success/success.component.html
+++ b/src/app/features/administration/success/success.component.html
@@ -53,9 +53,9 @@
 							<div>
 								Pour accéder au sondage et à tous ses paramètres :
 								<br />
-								<pre class="is-default" routerLink="{{ pollService.getAdministrationUrlFromForm() }}"
-									>{{ pollService.getAdministrationUrlFromForm() }}
-							</pre
+								<pre class="is-default" routerLink="{{ pollService.getAdministrationUrlFromForm() }}">
+									{{ pollService.getAdministrationUrlFromForm() }}
+								</pre
 								>
 								<app-copy-text
 									[textToCopy]="pollService.getAdministrationUrlFromForm()"
diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss
index 538c734d..4398bdc4 100644
--- a/src/styles/partials/_forms.scss
+++ b/src/styles/partials/_forms.scss
@@ -369,4 +369,5 @@ label {
 	font-size: 0.85rem;
 	line-height: 1rem;
 	margin-bottom: 0.5rem;
+	display: block;
 }
diff --git a/src/styles/partials/_typo.scss b/src/styles/partials/_typo.scss
index 58707fb6..a4fee562 100644
--- a/src/styles/partials/_typo.scss
+++ b/src/styles/partials/_typo.scss
@@ -1,39 +1,46 @@
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-	font-family: $title_font;
-}
+body {
+	h1,
+	h2,
+	h3,
+	h4,
+	h5,
+	h6 {
+		font-family: $title_font;
+		color: $primary_color;
+	}
 
-h1 {
-	font-family: $title_font;
-	&::after {
-		background-color: $primary_color;
-		height: 2px;
+	h1 {
+		font-family: $title_font;
+		&::after {
+			background-color: $primary_color;
+			height: 2px;
+		}
+	}
+
+	h2 {
+		font-family: $title_font;
+		font-size: 1.75rem;
+		font-weight: 600;
+		line-height: 2rem;
+		margin-bottom: 2rem;
+	}
+
+	h3 {
+		font-family: $title_font;
+	}
+
+	h4 {
+		font-family: $title_font;
+	}
+
+	.nobold {
+		font-weight: normal;
+	}
+
+	.text-right {
+		text-align: right;
+	}
+	.text-center {
+		text-align: center;
 	}
 }
-
-h2 {
-	font-family: $title_font;
-}
-
-h3 {
-	font-family: $title_font;
-}
-
-h4 {
-	font-family: $title_font;
-}
-
-.nobold {
-	font-weight: normal;
-}
-
-.text-right {
-	text-align: right;
-}
-.text-center {
-	text-align: center;
-}