-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cc05140
commit ce9eb1f
Showing
6 changed files
with
6 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
frontend/src/app/modules/dashboard/settings/pages/jours-feries/jours-feries.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 1 addition & 57 deletions
58
frontend/src/app/modules/dashboard/traitement/pages/effet/effet.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1 @@ | ||
<<<<<<< HEAD | ||
<ng-container [ngSwitch]="stepperOrientation | async"> | ||
<div *ngSwitchCase="'horizontal'">Make your screen smaller to see a vertical stepper</div> | ||
<div *ngSwitchCase="'vertical'">Make your screen larger to see a horizontal stepper</div> | ||
</ng-container> | ||
|
||
<mat-stepper | ||
class="example-stepper" | ||
[orientation]="(stepperOrientation | async)!"> | ||
<mat-step [stepControl]="firstFormGroup" label="Fill out your name"> | ||
<form [formGroup]="firstFormGroup"> | ||
<mat-form-field> | ||
<mat-label>Name</mat-label> | ||
<input matInput placeholder="Last name, First name" formControlName="firstCtrl" required> | ||
</mat-form-field> | ||
<div> | ||
<button mat-button matStepperNext>Next</button> | ||
</div> | ||
</form> | ||
</mat-step> | ||
<mat-step [stepControl]="secondFormGroup" label="Fill out your address"> | ||
<form [formGroup]="secondFormGroup"> | ||
<mat-form-field> | ||
<mat-label>Address</mat-label> | ||
<input matInput formControlName="secondCtrl" placeholder="Ex. 1 Main St, New York, NY" | ||
required> | ||
</mat-form-field> | ||
<div> | ||
<button mat-button matStepperPrevious>Back</button> | ||
<button mat-button matStepperNext>Next</button> | ||
</div> | ||
</form> | ||
</mat-step> | ||
<mat-step [stepControl]="thirdFormGroup" label="Fill out your phone number"> | ||
<form [formGroup]="thirdFormGroup"> | ||
<mat-form-field> | ||
<mat-label>Phone number</mat-label> | ||
<input matInput formControlName="thirdCtrl" placeholder="Ex. 12345678" required> | ||
</mat-form-field> | ||
<div> | ||
<button mat-button matStepperPrevious>Back</button> | ||
<button mat-button matStepperNext>Next</button> | ||
</div> | ||
</form> | ||
</mat-step> | ||
<mat-step> | ||
<ng-template matStepLabel>Done</ng-template> | ||
<p>You are now done.</p> | ||
<div> | ||
<button mat-button matStepperPrevious>Back</button> | ||
</div> | ||
</mat-step> | ||
</mat-stepper> | ||
|
||
======= | ||
<p>effet works!</p> | ||
>>>>>>> c14521bd719b24ef9bc1f001afce66bc65cbe1b4 | ||
<p>effet works!</p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters