Merge pull request #16 from AlineRinquin/blandine

Blandine

src/app/components/header/header.component.html

@@ -2,9 +2,9 @@
     <div class="container-fluid">
         <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
             <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>
         <a class="navbar-brand" href="#">Organizee</a>
     </div>
-</nav>
+</nav>

src/app/components/header/header.component.scss

@@ -1,4 +1,33 @@
 .navbar-brand {
   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%;
 }

src/app/components/signin/signin.component.html

@@ -3,36 +3,36 @@
     <main class="form-signin">
         <form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
             <div class="form-floating">
-                <input type="email" 
+                <input type="email"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingInput" 
+                        id="floatingInput"
-                        placeholder="" 
+                        placeholder=""
-                        name="email" 
+                        name="email"
                         ngModel
                         required
-                        [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['email'] != '' , 
+                        [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['email'] != '' ,
                                     'is-invalid': signinForm.form.touched && signinForm.form.value['email'] == ''}">
                 <label for="floatingInput">Adresse email</label>
             </div>
             <div class="form-floating">
-                <input type="password" 
+                <input type="password"
-                        class="form-control" 
+                        class="form-control"
-                        id="floatingPassword" 
+                        id="floatingPassword"
-                        placeholder="" 
+                        placeholder=""
                         name="password"
                         ngModel
                         required
-                        [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['password'] != '' , 
+                        [ngClass]="{'is-valid': signinForm.form.touched && signinForm.form.value['password'] != '' ,
                                     'is-invalid': signinForm.form.touched && signinForm.form.value['password'] == ''}">
                 <label for="floatingPassword">Mot de passe</label>
             </div>
 
-            <button class="w-100 btn btn-lg btn-success" 
+            <button class="w-100 btn btn-lg btn-outline-success"
                     type="submit"
                     [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"
             >S'inscrire</button>
 

src/app/components/signin/signin.component.scss

@@ -7,25 +7,34 @@
 .form-signin {
   width: 100%;
   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;
-  .form-floating:focus-within {
+  border-color: #ef5da8;
-    z-index: 2;
+}
-  }
+
-
+.form-floating:focus-within {
-  input[type="email"] {
+  z-index: 2;
-    margin-bottom: -1px;
+}
-    border-bottom-right-radius: 0;
+
-    border-bottom-left-radius: 0;
+input[type="email"] {
-  }
+  margin-bottom: -1px;
-
+  border-bottom-right-radius: 0;
-  input[type="password"] {
+  border-bottom-left-radius: 0;
-    margin-bottom: 10px;
+}
-    border-top-left-radius: 0;
+
-    border-top-right-radius: 0;
+input[type="password"] {
-  }
+  margin-bottom: 10px;
+  border-top-left-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;
 }