Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats

This commit is contained in:
Qwann 2017-01-20 18:53:49 +01:00
commit de3db1405e
972 changed files with 230 additions and 78255 deletions

View file

@ -8,7 +8,7 @@ input[type=number]::-webkit-outer-spin-button {
margin: 0;
}
#account, #checkout, input, #history, #basket, #basket_rel, #articles_data {
#account, #checkout, input, #history, #basket, #basket_rel, #previous_op, #articles_data {
background:#fff;
}
@ -335,12 +335,13 @@ input[type=number]::-webkit-outer-spin-button {
padding:0;
}
#basket, #basket_rel {
#basket, #basket_rel, #previous_op {
height:100%;
}
#basket_rel {
#basket_rel, #previous_op {
border-top:1px solid #C8102E;
padding-left: 3px;
}
#basket {
@ -354,6 +355,11 @@ input[type=number]::-webkit-outer-spin-button {
#basket_rel {
border-top:0;
margin-left:7px;
margin-right:7px;
}
#previous_op {
border-top:0;
margin-left:7px;
}
}
@ -385,6 +391,16 @@ input[type=number]::-webkit-outer-spin-button {
/* History */
#previous_op .trigramme {
width:100%;
background-color:rgba(200,16,46,0.85);
color:#FFF;
font-weight:bold;
padding:3px;
margin-left: -3px;
margin-bottom: 3px;
}
.kpsul_middle_right_col {
overflow:auto;
}

View file

@ -39,7 +39,7 @@ function amountDisplay(amount, is_cof=false, tri='') {
function amountToUKF(amount, is_cof=false) {
var coef_cof = is_cof ? 1 + settings['subvention_cof'] / 100 : 1;
return Math.round(amount * coef_cof * 10);
return Math.floor(amount * coef_cof * 10);
}
function isValidTrigramme(trigramme) {