popup cancel creation, buttons

This commit is contained in:
Tykayn 2022-03-10 09:52:35 +01:00 committed by tykayn
parent 7d1385185b
commit c93825a527
12 changed files with 11 additions and 55 deletions

View File

@ -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> </div>

View File

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

View File

@ -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> <h2 class="title is-2">Consulter le sondage</h2>
<button class="is-primary" [routerLink]="'/administration'"> <button class="is-primary" [routerLink]="'/administration'">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>

View File

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

View File

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

View File

@ -25,5 +25,4 @@
<app-nav-steps <app-nav-steps
[next_step_number]="pollService.step_current + 1" [next_step_number]="pollService.step_current + 1"
[previous_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> ></app-nav-steps>

View File

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

View File

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

View File

@ -146,47 +146,13 @@
height: 2rem; height: 2rem;
} }
.cancel-button-stepper {
padding: 0 1rem;
height: auto;
border-color: $primary_color;
color: $primary_color;
}
.cancel-button-confirm { .cancel-button-confirm {
color: $white !important;
background: $primary_color;
margin-left: 1rem; margin-left: 1rem;
margin-top: 0.75rem; margin-top: 0.75rem;
border-color: $primary_color !important;
padding: 10px 30px;
} }
.cancel-button-reject-bottom { .cancel-button-reject-bottom {
color: $primary_color !important;
border-color: $primary_color !important;
margin-top: 0.75rem; 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;
}
} }
} }

View File

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

View File

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

View File

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