DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #869 from sgmap/fix-807

Browse source 
[Fix #807] dossiers-table improvements + allow 5 columns
This commit is contained in:
gregoirenovel 2017-10-23 13:56:15 +02:00 committed by GitHub
commit eba0339313
4 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/new_design/champs/multiple_drop_down_list.js
View file

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

31
app/assets/stylesheets/new_design/dossiers_table.scss
View file

@ -2,6 +2,13 @@
@import "constants"; @import "constants";
.table.dossiers-table { .table.dossiers-table {
font-size: 14px;
th {
vertical-align: middle;
padding: (2 * $default-spacer) $default-spacer;
}
td { td {
padding: 0; padding: 0;
} }
@ -18,7 +25,10 @@
.cell-link { .cell-link {
color: $black; 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; display: block;
} }
@ -32,18 +42,23 @@
} }
} }
.number-col, .number-col {
.status-col { width: 110px;
width: 130px;
} }
.status-col span { .status-col {
width: 110px; width: 110px;
text-align: center;
.label {
width: 110px;
text-align: center;
}
} }
.follow-col { .follow-col {
width: 200px; width: 190px;
text-align: center; text-align: right;
padding-left: $default-spacer;
padding-right: $default-spacer;
} }
} }

1
app/assets/stylesheets/new_design/labels.scss
View file

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

3
app/assets/stylesheets/new_design/procedures_show.scss
View file

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