From 61767972410aa88c6711f6d74d29d1a2ff9175bb Mon Sep 17 00:00:00 2001
From: Adrien <adrienhuchet@hotmail.com>
Date: Tue, 5 Mar 2019 11:16:54 +0100
Subject: [PATCH] ajust

---
 assets/css/style.css             | 66 +++++++++++++++++++++++++++-----
 assets/html/includes/header.html |  6 +--
 assets/html/search.html          |  1 +
 assets/html/user_add.html        |  4 +-
 assets/html/user_edit.html       |  4 +-
 assets/html/user_list.html       |  4 +-
 6 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 04a43bf..d44966e 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -192,6 +192,7 @@ h3 {
 .nav_blog {
 	height: 80px;
 	background-color: #110230;
+	margin-bottom: 70px;
 }
 
 .item_nav_imie {
@@ -332,11 +333,24 @@ h3 {
 	transition: 300ms;
 
 }
-
 .bloc-plus:hover {
 	background-color: #42027e;
 	cursor: pointer;
 }
+.bloc-button{
+	margin-top: 40px;
+	background-color: #190034;
+	padding: 10px 15px;
+	color: white;
+	-webkit-transition: 300ms;
+	-o-transition: 300ms;
+	transition: 300ms;
+}
+
+.bloc-button:hover{
+	background-color: #42027e;
+	cursor: pointer;
+}
 
 .p-home {
 	padding-top: 20px;
@@ -347,6 +361,14 @@ h3 {
 input {
 	outline: none
 }
+.icon-search{
+	color: rgba(0, 0, 0, .5); 
+	width: 18px;
+	height: 18px;
+	background: none;
+	border: none;
+	cursor: pointer;
+}
 
 /* -----------------------------------------------------
  * 						Articles
@@ -460,18 +482,23 @@ input {
  * ----------------------------------------------------- */
 .bloc-post {
 	width: 69%;
-	margin-top: 70px;
-	box-shadow: 1px 1px 30px 1px lightgrey;
+	/* margin-top: 70px; */
+	/* box-shadow: 1px 1px 30px 1px lightgrey; */
 	background-position: center;
 	background-size: cover;
 	display: inline-block;
 	border-radius: 5px;
 }
-
 .container-post {
+	background-color: white;
+	padding: 45px;
+}
+
+.container-search {
 	margin-bottom: 30px;
 	background-color: white;
 	padding: 45px;
+	box-shadow: 1px 1px 30px 1px lightgrey;
 }
 
 .author {
@@ -479,6 +506,9 @@ input {
 	display: flex;
 	flex-flow: row wrap;
 }
+.row{
+	/* margin-bottom: 60px; */
+}
 
 .by {
 	margin-left: 20px;
@@ -496,13 +526,17 @@ input {
 
 .bloc-filter {
 	width: 25%;
-	margin-top: 70px;
+	/* margin-top: 70px; */
 	background-color: white;
 	background-size: cover;
 	box-shadow: 1px 1px 30px 1px lightgrey;
 	float: right;
 	padding: 45px;
 }
+label{
+	margin: 6px;
+	color: #3c3c3c;
+}
 
 .post .text {
 	font-size: 14px;
@@ -561,7 +595,6 @@ input {
 }
 
 .contenue-recent-search {
-	margin-top: 20px;
 	float: right;
 	box-shadow: 1px 1px 30px 1px lightgrey;
 	padding: 6px;
@@ -569,10 +602,12 @@ input {
 	background-color: white;
 	display: inline-block;
 	height: 30px;
+	margin-bottom: 30px;
 }
 
 .next {
 	float: right;
+	margin-top: 20px;
 }
 
 .filtre {
@@ -622,6 +657,7 @@ input {
 	padding: 7px 12px;
 	border-radius: 18px;
 	margin-top: 12px;
+	margin-right: 8px;
 }
 
 .icon-recent {
@@ -783,13 +819,17 @@ input {
 }
 
 form.login > input {
-	text-align: center;
+	/* text-align: center; */
 	display: block;
 	margin: auto;
+	margin-bottom: 10px;
+	padding: 6px 16px;
+	font-size: 14px;
+	border: none;
 }
 
 form.login >input[type="submit"], form.login > a {
-	left: -44%;
+	/* left: -44%; */
 	position: relative;
 	margin-top: 10px;
 	border: none;
@@ -804,7 +844,15 @@ a:hover {
 	text-decoration: none;
 	color: #fff;
 }
-
+.submit{
+	background: none;
+	border: none;
+	cursor: pointer;
+	outline: 0;
+}
+.submit:hover{
+	outline: none;
+}
 
 td, th {
 	border: 1px solid #dddddd;
diff --git a/assets/html/includes/header.html b/assets/html/includes/header.html
index 90fa19c..b24c533 100644
--- a/assets/html/includes/header.html
+++ b/assets/html/includes/header.html
@@ -18,7 +18,7 @@
 										<tag type="user" column="username" />
 									</if>
 									<if false>
-										<a href="/login">Connection</a>
+										<a href="/login">Connexion</a>
 									</if>
 								</tag>
 							</li>
@@ -46,8 +46,8 @@
 							<li class="item_nav_blog_droite_icon">
 								<form method="dialog" action="/search">
 									<input name="term" id="search" class="el-search" type="text" placeholder="Recherche">
-									<button type="submit">
-										<tag type="svg" file="mignify" style="color: rgba(0, 0, 0, .5); width: 18px; height: 18px" />
+									<button type="submit" class="submit">
+										<tag type="svg" file="mignify" style="color: rgba(0, 0, 0, .5); width: 18px; height: 18px;" />
 									</button>
 								</form>
 							</li>
diff --git a/assets/html/search.html b/assets/html/search.html
index 4e76191..f5ee57c 100644
--- a/assets/html/search.html
+++ b/assets/html/search.html
@@ -44,6 +44,7 @@
 		</div>
 
 		<div class="bloc-filter int-search">
+			<h3>Filtrer la recherche</h3>
 			<p class="title-small">Catégories</p>
 			<a data-category="3" class="filtre dev-color">dev</a>
 			<a data-category="4" class="filtre digi-color">digi</a>
diff --git a/assets/html/user_add.html b/assets/html/user_add.html
index f479380..7327279 100644
--- a/assets/html/user_add.html
+++ b/assets/html/user_add.html
@@ -15,7 +15,7 @@
 					<h1>LE BLOG DES APPRENANTS</h1>
 				</div>
 				<div class="cover-text">
-					<h2 id="titre-home">Voilà les informations que vous devez entrer pour créer un utilisateur</h2>
+					<h2 id="titre-home">Créer un utilisateur</h2>
 					<div class="p-home">
 						<form name="login" id="name" method="POST" class="login" action="/users/new/">
 							<input name="username" id="username" type="text" placeholder="Nom d'utilisateur" />
@@ -25,7 +25,7 @@
 								<option value="ROLE_EDITOR">Editeur</option>
 								<option value="ROLE_ADMIN">Administrateur</option>
 							</select>
-							<input type="submit" class="bloc-plus" value="Créer"/>
+							<input type="submit" class="bloc-button" value="Créer"/>
 						</form>
 					</div>
 				</div>
diff --git a/assets/html/user_edit.html b/assets/html/user_edit.html
index 516c8e3..3a11209 100644
--- a/assets/html/user_edit.html
+++ b/assets/html/user_edit.html
@@ -15,7 +15,7 @@
 					<h1>LE BLOG DES APPRENANTS</h1>
 				</div>
 				<div class="cover-text">
-					<h2 id="titre-home">Voilà les informations que vous devez entrer pour créer un utilisateur</h2>
+					<h2 id="titre-home">Créer un utilisateur</h2>
 					<div class="p-home">
 						<form name="login" id="name" method="POST" class="login" action="./edit">
 							<input name="username" id="username" type="text" placeholder="Nom d'utilisateur" />
@@ -25,7 +25,7 @@
 								<option value="ROLE_EDITOR">Editeur</option>
 								<option value="ROLE_ADMIN">Administrateur</option>
 							</select>
-							<input type="submit" class="bloc-plus" value="Créer"/>
+							<input type="submit" class="bloc-button" value="Créer"/>
 						</form>
 					</div>
 				</div>
diff --git a/assets/html/user_list.html b/assets/html/user_list.html
index 9b03a3a..375a683 100644
--- a/assets/html/user_list.html
+++ b/assets/html/user_list.html
@@ -15,7 +15,7 @@
 					<h1>LE BLOG DES APPRENANTS</h1>
 				</div>
 				<div class="cover-text">
-					<h2 id="titre-home">cliquez sur un utilisateur pour le modifier</h2>
+					<h2 id="titre-home">Cliquez sur un utilisateur pour le modifier</h2>
 					<table>
 						<thead>
 							<tr>
@@ -36,7 +36,7 @@
 							</tag>
 						</tbody>
 					</table>
-					<a href="/users/new" class="bloc-plus">Nouvel utilisateur</a>
+					<a href="/users/new" class="bloc-button">Nouvel utilisateur</a>
 				</div>
 			</div>
 		</div>