Merge branch 'master' of gitlab.com:aviortheking/blog_imie

This commit is contained in:
Florian Bouillon 2019-03-07 10:17:03 +01:00
commit a2f1200654
5 changed files with 24 additions and 10 deletions

View File

@ -128,6 +128,15 @@ h3 {
margin-top: 30px;
}
.title-edit {
font-weight: 200;
font-size: 15px;
margin-bottom: 12px;
}
.addTag{
margin-top: 20px;
}
.contenue {
height: 285vh;
}
@ -440,6 +449,7 @@ input {
.article .etiquettes,
.post .etiquettes {
margin-top: 15px;
margin-bottom: 15px;
}
.article .date,
@ -533,6 +543,10 @@ input {
padding: 45px;
/* border-radius: 5px; */
}
.container-edit{
background-color: white;
padding: 45px 45px 115px 45px;
}
.container-search {
margin-bottom: 30px;
background-color: white;
@ -578,7 +592,7 @@ input {
box-shadow: 1px 1px 30px 1px lightgrey;
float: right;
padding: 45px;
border-radius: 5px;
/* border-radius: 5px; */
}
.bloc-filter a{
color: white;

View File

@ -10,7 +10,7 @@
</header>
<main class="test container">
<div class="bloc-post">
<div class="container-post post column-cat">
<div class="container-edit post column-cat">
<h2 class="title">
<tag type="editor" element="title" />
</h2>
@ -26,13 +26,13 @@
<tag type="editor" element="content" />
</p>
<button class="bloc-plus submitPost">
Créer
Enregistrer
</button>
</div>
</div>
<div class="bloc-filter">
<p class="title-small">Tags</p>
<p class="title-edit">Tags</p>
<tag type="editor" element="tags" />
</div>
</main>

View File

@ -32,7 +32,7 @@
</div>
<div class="bloc-filter">
<p class="title-small">Tags</p>
<p class="title-edit">Tags</p>
<tag type="editor" element="tags" />
</div>
</main>

View File

@ -9,10 +9,10 @@
<tag type="includes" file="header" />
</header>
<main class="test container">
<div class="bloc_principal">
<div class="cover-black">
<div class="">
<div class="">
<div class="bloc_principal_titre">
<h1>LE BLOG DES APPRENANTS</h1>
<h1>UTILISATEUR</h1>
</div>
<div class="cover-text">
<h2 id="titre-home">Créer un utilisateur</h2>
@ -25,8 +25,8 @@
<option value="ROLE_EDITOR">Editeur</option>
<option value="ROLE_ADMIN">Administrateur</option>
</select>
<input type="submit" class="bloc-button" value="Créer"/>
</form>
<input type="submit" class="bloc-button" value="Créer"/>
</div>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div>
<div>
<div class="bloc_principal_titre">
<h1>INFORMATIONS UTILISATEUR</h1>
<h1>UTILISATEUR</h1>
</div>
<div class="cover-text">
<h2 id="titre-home">Modifier un utilisateur</h2>