popup cancel creation, buttons

src/app/features/administration/administration.component.html

@@ -1,5 +1,3 @@
-<div class="columns administration">
+<div class="administration">
-	<div class="column">
+	<app-admin-form [poll]="poll"></app-admin-form>
-		<app-admin-form [poll]="poll"></app-admin-form>
-	</div>
 </div>

src/app/features/administration/administration.component.scss

@@ -1,5 +0,0 @@
-:host {
-	> .columns {
-		margin-top: 0;
-	}
-}

src/app/features/administration/consultation/consultation.component.html

@@ -1,4 +1,4 @@
-<div class="admin-consultation min-height padded">
+<div class="admin-consultation min-height">
 	<h2 class="title is-2">Consulter le sondage</h2>
 	<button class="is-primary" [routerLink]="'/administration'">
 		<i class="fa fa-pencil"></i>

src/app/features/administration/form/form.component.html

@@ -1,5 +1,5 @@
 <div class="admin-form">
-	<section class="min-height padded">
+	<section class="min-height">
 		<router-outlet>
 			<app-step-one [form]="form"></app-step-one>
 		</router-outlet>

src/app/features/administration/form/steps/step-one/step-one.component.html

@@ -84,7 +84,6 @@
 <app-nav-steps
 	[display_previous_button]="false"
 	[display_next_button]="true"
-	[next_is_disabled]="!pollService.form.value.title"
 	[next_step_number]="pollService.step_current + 1"
 	[previous_step_number]="pollService.step_current - 1"
 ></app-nav-steps>

src/app/features/administration/form/steps/step-six/step-six.component.html

@@ -25,5 +25,4 @@
 <app-nav-steps
 	[next_step_number]="pollService.step_current + 1"
 	[previous_step_number]="pollService.step_current - 1"
-	[next_is_disabled]="!pollService.form.value.creatorEmail || !pollService.form.value.creatorPseudo"
 ></app-nav-steps>

src/app/features/administration/form/steps/step-two/step-two.component.scss

@@ -20,7 +20,7 @@
 		transition: background-color ease 1.5s;
 		color: $font-color;
 		margin-bottom: 0.85rem;
-		padding: 1rem 1rem 1rem 48px;
+		padding: 1.69rem 1rem 1.69rem 48px;
 
 		label {
 			font-weight: 700;

src/app/features/administration/stepper/stepper.component.html

@@ -86,7 +86,7 @@
 		<div class="is-hidden-smallest-screen has-right-elements pull-right">
 			<app-language-selector class="nav-button"></app-language-selector>
 			<button
-				class="nav-button cancel-button-stepper"
+				class="is-secondary is-thin cancel-button-stepper"
 				(click)="showCancelDialog()"
 				id="display_cancel_popup_button"
 				aria-haspopup="dialog"
@@ -131,10 +131,10 @@
 		<ng-template pTemplate="footer">
 			<div class="columns">
 				<div class="column has-no-padding">
-					<button class="button cancel-button-reject-bottom is-outlined" (click)="focusOnCancelButton()">
+					<button class="button cancel-button-reject-bottom is-secondary" (click)="focusOnCancelButton()">
 						{{ 'popup.cancel.reject' | translate }}
 					</button>
-					<button class="button cancel-button-confirm" (click)="goToHome()">
+					<button class="button cancel-button-confirm is-primary" (click)="goToHome()">
 						{{ 'popup.cancel.validate' | translate }}
 					</button>
 				</div>

src/app/features/administration/stepper/stepper.component.scss

@@ -146,47 +146,13 @@
 		height: 2rem;
 	}
 
-	.cancel-button-stepper {
-		padding: 0 1rem;
-		height: auto;
-		border-color: $primary_color;
-		color: $primary_color;
-	}
-
 	.cancel-button-confirm {
-		color: $white !important;
-		background: $primary_color;
 		margin-left: 1rem;
 		margin-top: 0.75rem;
-		border-color: $primary_color !important;
-		padding: 10px 30px;
 	}
 
 	.cancel-button-reject-bottom {
-		color: $primary_color !important;
-		border-color: $primary_color !important;
 		margin-top: 0.75rem;
-		padding: 10px 30px;
-
-		&:hover {
-			color: $white;
-			background: $primary_color;
-		}
-	}
-
-	.cancel-button-reject {
-		background: none;
-		color: $primary_color;
-		margin-right: -1rem;
-		float: right;
-
-		.icon {
-			margin-left: 1rem;
-			height: 1rem;
-			width: 1rem;
-			margin-top: 0.15rem;
-			float: right;
-		}
 	}
 }
 

src/styles/libraries/_overrides.scss

@@ -37,8 +37,7 @@ $input-shadow: none;
 
 .cancel-button-reject {
 	background: none;
-	color: $primary_color;
+	margin-right: -1.55rem;
-	margin-right: -1rem;
 	float: right;
 
 	.icon {

src/styles/partials/_forms.scss

@@ -290,7 +290,7 @@ mat-checkbox {
 .step {
 	max-width: $main-column-width;
 	margin: 0 auto;
-	padding: 7rem 0;
+	padding: 120px 0;
 	box-sizing: border-box;
 	@extend .top-padding-nav;
 

src/styles/partials/_responsive.scss

@@ -113,7 +113,7 @@
 // wide screen like desktop
 @media (min-width: $widescreen) {
 	.step {
-		padding: 6rem 0;
+		padding: 120px 0;
 	}
 	.date-choice > input:first-of-type {
 		width: 75%;