From b32cf018d5aa562ea9eb575f4dffc293c14c11a5 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Tue, 26 May 2020 10:11:59 +0200
Subject: [PATCH] bugfix : admin-circle-create - conflict resolved + accurate
 styles added + update of form.scss

---
 src/styles/base/form.scss                     |  3 ++-
 src/views/admin/page-admin-circles-create.pug | 13 ++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss
index f02f7a5..617f20e 100644
--- a/src/styles/base/form.scss
+++ b/src/styles/base/form.scss
@@ -112,7 +112,8 @@ textarea {
 
 /* WIDGETS SIB  (let in .content-box to override default styles) */
 
-sib-form-auto-completion {
+sib-form-auto-completion,
+hubl-status {
 
   .ss-main {
     font-weight: normal;
diff --git a/src/views/admin/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug
index 449e27f..5883464 100644
--- a/src/views/admin/page-admin-circles-create.pug
+++ b/src/views/admin/page-admin-circles-create.pug
@@ -8,21 +8,16 @@ div.content-box__info.flex
 
     fields='status, name, description'
 
-    label-status='Statut du canal'
-    widget-status='hubl-status'
-
-<<<<<<< HEAD
-    class-name='form-label is-light is-full-width'
-    class-description='form-label is-light is-full-width'
-      class-status='form-label is-light is-full-width member-select color'
-=======
+    class-status='form-label is-light is-full-width color'
     class-name='form-label is-light is-full-width input-text-like'
     class-description='form-label is-light is-full-width input-text-like'
->>>>>>> 013eeda... update: label for form reviewed + class added for input
 
+    label-status='Statut du canal'
     label-name='Nom du canal *'
     label-description='Sous-titre du canal *'
 
+    widget-status='hubl-status'
+    
     next='admin-circle-list'
 
     submit-button='Enregistrer'