Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin

src/styles/_index.scss

@@ -17,6 +17,6 @@ div#viewport {
     @import 'layout/members/index';
     @import 'layout/job-offers/index';
     @import 'layout/project-profile/index';
-    @import 'layout/circle-profile/index';
+    @import 'layout/circle/index';
     @import 'layout/user/index';
 }

src/styles/layout/circle/circle-edit.scss

@@ -16,8 +16,40 @@
     width: 50%;
   }
 
-    >*:first-of-type {
-      border-right: 1px solid white;
+  >*:last-of-type {
+    border-left: 1px solid white;
+
+    @media (max-width: 1220px) {
+      display: none;
+    }
+  }
+}
+
+.table-body div team-template-edit {
+  display: flex;
+  justify-content: space-between;
+
+  >* {
+    border-bottom: 1px solid $color-228-25-79;
+    flex: 1;
+    width: 50%;
+  }
+
+  sib-display {
+    border-left: 1px solid $color-228-25-79;
+    border-right: 1px solid $color-228-25-79;
+    padding: 0 2.2rem;
+  }
+
+  sib-ac-checker {
+    align-items: center;
+    border-right: 1px solid $color-228-25-79;
+    display: flex;
+    justify-content: flex-end;
+    padding: 2.7rem 2.2rem;
+
+    @media (max-width: 1220px) {
+      display: none;
     } 
   }
 
@@ -88,18 +120,27 @@
           width: 100%;
         }
 
+<<<<<<< HEAD:src/styles/layout/circle-profile/circle-edit.scss
         object {
           height: 45%;
           width: 45%;
         }
+=======
+      [name='name'] {
+        font-weight: 600;
+        margin-right: 1rem;
+>>>>>>> 81d885730dd7673ee424a72b6f0c663c7c1cc5b7:src/styles/layout/circle/circle-edit.scss
       }
 
       >[name='sup'] {
         align-self: end;
         display: flex;
+<<<<<<< HEAD:src/styles/layout/circle-profile/circle-edit.scss
         grid-column: 2 / span 1;
         grid-row: 1 / span 1;
         margin-bottom: 0.50rem;
+=======
+>>>>>>> 81d885730dd7673ee424a72b6f0c663c7c1cc5b7:src/styles/layout/circle/circle-edit.scss
 
         [name='name'] {
           font-weight: 600;