From 161c70f57ccaf8ab3bb1abed653a09864be3e4a8 Mon Sep 17 00:00:00 2001 From: MarcF06110 <60645785+MarcF06110@users.noreply.github.com> Date: Thu, 16 Apr 2020 16:28:14 +0200 Subject: [PATCH] Revert "Feature/mf 1.2.3 modif search list user"" (#208) * Revert "Revert "Feature/mf 1.2.3 modif search list user" (#207)" This reverts commit 1ebff8179be76befcc91e92f43afd334cafbac00. * mf 1.2.3 modif html. * MF 1.2.3 modif css padding et interval --- .../home/users-list/users-list.component.html | 158 +++++++++--------- .../home/users-list/users-list.component.scss | 97 ++++++----- 2 files changed, 131 insertions(+), 124 deletions(-) diff --git a/skillful_network_client/src/app/home/users-list/users-list.component.html b/skillful_network_client/src/app/home/users-list/users-list.component.html index 0033fe11..0bc2d25a 100755 --- a/skillful_network_client/src/app/home/users-list/users-list.component.html +++ b/skillful_network_client/src/app/home/users-list/users-list.component.html @@ -1,79 +1,79 @@ - -
- - - -
-
- Liste des utilisateurs -
-
-
- -
- - Recherche par Nom ou Prénom - search - - Appuyez sur Entrée après saisie - -
-
-
-
-
-
- - - - -
-
- - - - - - Prénom - {{user.firstName}} - - - - Nom - {{user.lastName}} - - - - Date de naissance - {{user.birthDate | date: "dd/MM/yyyy"}} - - - - - Details - visibility - - - - - -
- - -
-
-
-
- -
-
- + +
+ + + +
+
+ Liste des utilisateurs +
+
+
+ +
+ + Recherche par Nom ou Prénom + search + + Appuyez sur Entrée après saisie + +
+
+
+
+
+
+ + + + +
+
+ + + + + + Prénom + {{user.firstName}} + + + + Nom + {{user.lastName}} + + + + Date de naissance + {{user.birthDate | date: "dd/MM/yyyy"}} + + + + + Details + visibility + + + + + +
+ + +
+
+
+
+ +
+
+ diff --git a/skillful_network_client/src/app/home/users-list/users-list.component.scss b/skillful_network_client/src/app/home/users-list/users-list.component.scss index bccb114d..a82d7078 100755 --- a/skillful_network_client/src/app/home/users-list/users-list.component.scss +++ b/skillful_network_client/src/app/home/users-list/users-list.component.scss @@ -1,57 +1,64 @@ -.user-list{ - width: 85%; - margin: auto; - padding-top: 60px; +h1 { + text-align: center; } -h1{ - text-align: center; - } - - table { - width: 100%; - margin: auto; - text-align: center; - } - mat-header-cell, mat-cell { - justify-content: center; - } - - a { - color:black; - } +table { + width: 100%; + text-align: center; +} + +mat-header-cell, mat-cell { + justify-content: center; +} + +a { + color: black; +} + +.mat-card-header { + display: block; +} + +.mat-card-title { + text-align: center; + margin-left: 30%; + margin-top: 1rem; +} .mat-form-field { font-size: 14px; - padding: 10px; - width: 400px; + width: 300px; +} + +td, th { + width: 20%; +} + +.btnIcon { + color: black; + margin-top: 7px; +} + +.table-container { + width: 80%; } - - td, th { - width: 20%; - } - .btnIcon { - color:black; - margin-top: 7px; - } - - .table-container { - width: 80%; - } .cursor { - cursor: pointer; - } + cursor: pointer; +} + +.boutonSearch { + display: none; +} + +.progressBarDiv { + margin-top: 12%; +} + +.is-loading { + margin: 0 auto; +} -.boutonSearch{ - display: none; - } - .progressBarDiv { - margin-top: 12%; - } - .is-loading{ - margin:0 auto; - } @media screen and (max-width: 640px) { .mat-form-field {