From a468fe237767a4ce2ecbdc08a72fd3da2adb73d3 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Wed, 10 Jun 2020 15:36:45 +0200
Subject: [PATCH] update: height of pages + bug on project edit form

---
 src/page-circle.pug                     | 2 +-
 src/page-project.pug                    | 2 +-
 src/styles/base/main.scss               | 8 ++++++++
 src/views/admin/page-admin-circles.pug  | 2 +-
 src/views/admin/page-admin-projects.pug | 2 +-
 src/views/admin/page-admin-users.pug    | 2 +-
 src/views/project/page-project-edit.pug | 4 ++--
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/page-circle.pug b/src/page-circle.pug
index 95146fd..dac52a9 100644
--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -10,7 +10,7 @@
           class-description='h1-aside description'
         )
         button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
-    div
+    div.content-box__height
       sib-ac-checker(permission='acl:Read', bind-resources)
         #circle-chat(hidden)
           include views/circle/page-circle-chat.pug
diff --git a/src/page-project.pug b/src/page-project.pug
index 1c27ec3..bbb88da 100644
--- a/src/page-project.pug
+++ b/src/page-project.pug
@@ -14,7 +14,7 @@
           value-const-title1='N°'
         )
         button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
-    div
+    div.content-box__height
       sib-ac-checker(permission='acl:Read', bind-resources)
         #project-chat(hidden)
           include views/project/page-project-chat.pug
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index ef152ae..ae485da 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -348,6 +348,14 @@ h5 {
   }
 }
 
+.content-box__height {
+  height: calc(100vh - 50px - 56px); /* Heights of main header and sub-header */
+
+  @include breakpoint(lg) {
+    height: calc(100vh - 83px - 84px);
+  }
+}
+
 .content-box__info {
   flex-direction: column;
   padding: 3.2rem;
diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index 6ebb825..159310a 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -10,7 +10,7 @@
 
   include ../circle/page-circle-left.pug
 
-  #admin-circle-list(hidden)
+  #admin-circle-list.content-box__height(hidden)
     include ../../templates/hubl-user-avatar.pug
 
     sib-widget(name='hubl-circle-owner')
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index bce6112..68f8360 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -11,7 +11,7 @@
   #project-left(hidden)
     include ../project/page-project-left.pug
 
-  #admin-project-list(hidden)
+  #admin-project-list.content-box__height(hidden)
     include ../../templates/hubl-user-avatar.pug
 
     div.content-box__info.flex
diff --git a/src/views/admin/page-admin-users.pug b/src/views/admin/page-admin-users.pug
index ac954fd..2d33d81 100644
--- a/src/views/admin/page-admin-users.pug
+++ b/src/views/admin/page-admin-users.pug
@@ -18,7 +18,7 @@
         )
 
 
-  #admin-users-list(hidden)
+  #admin-users-list.content-box__height(hidden)
     div.content-box__info.flex
       div.admin-header.flex
         h3 Utilisateurs
diff --git a/src/views/project/page-project-edit.pug b/src/views/project/page-project-edit.pug
index 195c6a0..7926097 100644
--- a/src/views/project/page-project-edit.pug
+++ b/src/views/project/page-project-edit.pug
@@ -1,4 +1,4 @@
-div.content-box__info.flex
+div.content-box__info
 
   include ../../templates/hubl-user-avatar.pug
 
@@ -13,7 +13,7 @@ div.content-box__info.flex
   sib-form.form.button-register(
 	  bind-resources
 	
-	  fields='fieldset-info, block-project__info(customer, name, description), fieldset-fee, block-project__fee(businessProvider, businessProviderFee)'
+	  fields='fieldset-info, customer, name, description, fieldset-fee, businessProvider, businessProviderFee'
 
     class-customer='form-label is-light is-half-width'
     widget-customer='sib-form-auto-completion'