Merge pull request #869 from sgmap/fix-807

[Fix #807] dossiers-table improvements + allow 5 columns

app/assets/javascripts/new_design/champs/multiple_drop_down_list.js

@@ -3,7 +3,7 @@ document.addEventListener('turbolinks:load', function() {
 
   $('select.select2-limited').select2({
     'placeholder': 'Sélectionnez des colonnes',
-    'maximumSelectionLength': '2',
+    'maximumSelectionLength': '5',
     'width': '300px'
   });
 });

app/assets/stylesheets/new_design/dossiers_table.scss

@@ -2,6 +2,13 @@
 @import "constants";
 
 .table.dossiers-table {
+  font-size: 14px;
+
+  th {
+    vertical-align: middle;
+    padding: (2 * $default-spacer) $default-spacer;
+  }
+
   td {
     padding: 0;
   }
@@ -18,7 +25,10 @@
 
   .cell-link {
     color: $black;
-    padding: (3 * $default-spacer) 2px;
+    // In order to have identical height in the table header and the table rows,
+    // we compensate for the height difference between the biggest element of the header
+    // (the Personnaliser button, 38px) and the biggest cell-link element of the rows (the label, 28px)
+    padding: calc((2 * #{$default-spacer}) + ((38px - 28px) / 2)) $default-spacer;
     display: block;
   }
 
@@ -32,18 +42,23 @@
     }
   }
 
-  .number-col,
-  .status-col {
-    width: 130px;
+  .number-col {
+    width: 110px;
   }
 
-  .status-col span {
+  .status-col {
+    width: 110px;
+
+    .label {
       width: 110px;
       text-align: center;
     }
+  }
 
   .follow-col {
-    width: 200px;
-    text-align: center;
+    width: 190px;
+    text-align: right;
+    padding-left: $default-spacer;
+    padding-right: $default-spacer;
   }
 }

app/assets/stylesheets/new_design/labels.scss

@@ -9,6 +9,7 @@
   color: #FFFFFF;
   border-radius: 4px;
   font-size: 12px;
+  line-height: 18px;
 
   &.instruction {
     background-color: #FFFFFF;

app/assets/stylesheets/new_design/procedures_show.scss

@@ -15,7 +15,8 @@
   }
 
   .dossiers-table {
-    margin: (3 * $default-spacer) auto;
+    margin-top: $default-spacer;
+    margin-bottom: 3 * $default-spacer;
   }
 
   .procedure-actions {