Merge branch 'dev' into sana

This commit is contained in:
AlineRinquin 2022-02-17 10:22:14 +01:00 committed by GitHub
commit 60c1753ea4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 279 additions and 178 deletions

View file

@ -1,3 +1,29 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<app-card-menu></app-card-menu>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class=" col compte text-center">
<h1>Menu de la semaine</h1>
<main class="contenu-compte">
<app-card-menu></app-card-menu>
<div class="d-flex justify-content-center">
</div>
<div class="d-flex justify-content-center">
</div>
<div class="d-flex justify-content-center">
</div>
<div class="d-flex justify-content-center">
</div>
<div class="d-flex justify-content-center">
</div>
<div class="d-flex justify-content-center">
</div>
</main>
</div>

View file

@ -1,12 +1,12 @@
<app-header></app-header>
<div class="signup-form text-center">
<h1>Inscrivez-vous !</h1>
<label for="floatingInputcouleur">Choisissez une couleur</label>
<main class="form-signup">
<form (ngSubmit)="onSubmit()" [formGroup]="signupForm">
<div class="form-floating">
<input type="color" class="form-control" id="floatingInputcouleur" placeholder="" name="couleur"
formControlName="couleurFc">
</div>
<div class="form-floating">
<input