isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16 from AlineRinquin/blandine

Browse Source 
Blandine
This commit is contained in:
AlineRinquin 2022-01-26 15:44:12 +01:00 committed by GitHub
commit a7483795a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/header/header.component.html
View File

@ -2,7 +2,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="collapse navbar-collapse" id="navbarNavAltMarkup"> <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav"> <div class="navbar-nav">
<img routerLink="accueil" routerLinkActive="active-custom" class="nav-link" style="max-height: 12% ; max-width: 12%" src="../../../assets/images/logo-organizee.png"/> <img id="img" routerLink="accueil" routerLinkActive="active-custom" src="../../../assets/images/logo-organizee.png"/>
</div> </div>
</div> </div>
<a class="navbar-brand" href="#">Organizee</a> <a class="navbar-brand" href="#">Organizee</a>

31
src/app/components/header/header.component.scss
View File

@ -1,4 +1,33 @@
.navbar-brand { .navbar-brand {
position: absolute; position: absolute;
margin-left: 10%; margin-left: 12%;
font-family: Arial, Helvetica, sans-serif;
font-weight: bold;
font-size: 3rem;
color: #5d5fef;
}
a:visited {
color: #5d5fef;
}
a:focus {
border-bottom: 1px solid;
background: #a5a6f6;
}
a:hover {
color: #7879f1;
}
a:active {
color: #5d5fef;
}
.navbar-nav {
height: 6rem;
}
#img {
margin-left: 50%;
} }

4
src/app/components/signin/signin.component.html
View File

@ -27,12 +27,12 @@
<label for="floatingPassword">Mot de passe</label> <label for="floatingPassword">Mot de passe</label>
</div> </div>
<button class="w-100 btn btn-lg btn-success" <button class="w-100 btn btn-lg btn-outline-success"
type="submit" type="submit"
[disabled]="signinForm.invalid">Se connecter</button> [disabled]="signinForm.invalid">Se connecter</button>
<button class="w-100 btn btn-lg btn-success" <button class="w-100 btn btn-lg btn-outline-success"
routerLink="../creation-compte" routerLinkActive="active-custom" routerLink="../creation-compte" routerLinkActive="active-custom"
>S'inscrire</button> >S'inscrire</button>

31
src/app/components/signin/signin.component.scss
View File

@ -7,25 +7,34 @@
.form-signin { .form-signin {
width: 100%; width: 100%;
max-width: 330px; max-width: 330px;
padding: 15px; margin-top: 50px;
margin: auto; margin-left: auto;
.checkbox { margin-right: auto;
font-weight: 400; border: solid 1px;
} border-radius: 10px;
background-color: #fcddec;
border-color: #ef5da8;
}
.form-floating:focus-within { .form-floating:focus-within {
z-index: 2; z-index: 2;
} }
input[type="email"] { input[type="email"] {
margin-bottom: -1px; margin-bottom: -1px;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
input[type="password"] { input[type="password"] {
margin-bottom: 10px; margin-bottom: 10px;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.btn-outline-success {
margin-top: 10px;
margin-bottom: 5px;
background-color: #ffff;
color: #ef5da8 !important;
border-color: #ef5da8 !important;
} }