Merge remote-tracking branch 'origin/master' into features/household-editor

src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss

@@ -41,6 +41,12 @@ table {
    }
 }
 
+// règle la typo des étiquettes de dénomination rendues avec renderBox
+.chill_denomination {
+   font-size: 1.3em;
+   font-weight: 700;
+}
+
 /*
  *  ACCOMPANYING_COURSE
  *  Header custom for Accompanying Course
@@ -79,6 +85,18 @@ div.flex-table {
    h2, h3, h4 {
       color: var(--chill-blue);
    }
+   div.item-bloc {
+      // We use box-shadow instead of border
+      // to avoid to manage border double-width 
+      // when blocs are resized for small screen !
+      // Then we can simulate border-collapse: collapse (table)
+      box-shadow: 
+          1px 0 0 0 #000, 
+          0 1px 0 0 #000, 
+          1px 1px 0 0 #000,   /* fix the corner */
+          1px 0 0 0 #000 inset, 
+          0 1px 0 0 #000 inset;
+   }
 }
 
 /*
@@ -94,11 +112,8 @@ div.flex-bloc {
 
    div.item-bloc {
       flex-grow: 0; flex-shrink: 1; flex-basis: 50%;
-
       margin: 0;
-      border: 1px solid #000;
       padding: 1em;
-
       border-top: 0;
       &:nth-child(1), &:nth-child(2) {
          border-top: 1px solid #000;
@@ -167,11 +182,6 @@ div.flex-table {
       display: flex;
       flex-direction: column;
       padding: 1em;
-      border: 1px solid #000;
-      border-top: 0;
-      &:first-child {
-         border-top: 1px solid #000;
-      }
       &:nth-child(even) {
          background-color: #e6e6e6;
       }