fix: merge conflicts

src/views/project/page-project-chat.pug

@@ -1,4 +1,4 @@
-.content-box.with-padding.full-width.chat-view
+.content-box.flex.full-width.chat-view
   sib-chat(
     data-authentication='login',
     data-auto-login='true',

src/views/project/page-project-edit.pug

@@ -1,16 +1,12 @@
 div.content-box__info
 
   include ../../templates/hubl-user-avatar.pug
-
-  sib-widget(name='hubl-fieldset-title')
-    template
-      label ${label}
 			
   sib-link(class='backlink right', bind-resources, next='project-profile') Retour
 
   h1 Modifie ton projet
 
-  sib-form.form-edit(
+  sib-form.form.button-register(
 	  bind-resources
 	
 	  fields='status, block-project__info(customer.name, name), description'
@@ -47,13 +43,13 @@ div.content-box__info
 
   h2 Liste des membres :
 
-  sib-form.block.select-add-member(
+  sib-form.block.select-add.button-add(
     bind-resources 
     nested-field='members'
     fields='user'
     range-user=`${endpoints.users || endpoints.get.users}`
 
-    class-user='team form-label is-dark'
+    class-user='team form-label is-light'
     label-user=''
     widget-user='sib-form-auto-completion'
 

src/views/project/page-project-left.pug

@@ -1,5 +1,5 @@
 #project-left
-  div.content-box__info(style="padding: 15px")
+  div.content-box__info.flex(style="padding: 15px")
 
     p Tu as quitté ce projet.
     p Ceci est un groupe privé. Pour le rejoindre, rends-toi dans le panneau <sib-link next="admin-project-list">administration</sib-link> et demande une invitation.

src/views/project/page-project-profile.pug

@@ -5,13 +5,12 @@ sib-router(default-route='project-profile', hidden)
 #project-profile(hidden)
   include ../../templates/hubl-captain.pug
   include ../../templates/hubl-circle-team.pug
-  include ../../templates/hubl-customer.pug
   include ../../templates/hubl-project-team.pug
 
-  .content-box__info
+  .content-box__info.flex
 
-    .space-between
-      sib-display(
+    .flex.space-between.with-padding.mobile-vertical-align
+      sib-display.mobile-margin__bottom(
         bind-resources
         fields='creationDateSet(title, creationDate)'
 
@@ -71,14 +70,10 @@ sib-router(default-route='project-profile', hidden)
     sib-widget(name='hubl-project-leave-button')
       template
         sib-delete(
-          class='button btn-margin-left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
+          class='button desktop-btn-margin__left text-bold text-uppercase reversed button-secondary bordered with-icon icon-close'
           data-src="${src}"
           data-label='Quitter le groupe'
         )
-  
 
-
-
-
-#project-edit(hidden)
+#project-edit.content-box__height(hidden)
   include page-project-edit.pug