diff --git a/css/global.css b/css/global.css index fb0ee7a..3e479ab 100644 --- a/css/global.css +++ b/css/global.css @@ -8,30 +8,36 @@ html { } + .btn-infos { margin: 2px; /* color: black; */ - background-color: royalblue; - border: 2px solid royalblue; + background-color: transparent; + border: 5px solid #0018e8; border-radius: 10px; } .btn-infos:hover { - border-color: rgb(45, 73, 156); - background-color: rgb(45, 73, 156); + border-color: #0018e8; + background-color: #0018e8; + ; } .btn-accept { margin: 2px; /* color: black; */ - background-color: royalblue; - border: 2px solid royalblue; + background-color: transparent; + border: 5px solid #0018e8; border-radius: 10px; } .btn-accept:hover { - border-color: rgb(45, 73, 156); - background-color: rgb(45, 73, 156); + border-color: rgb(33, 196, 0); + background-color: rgb(33, 196, 0); +} + +.card { + margin-bottom: 30px; } .contract-screen { @@ -45,15 +51,18 @@ html { } .card-body { + display: grid; + grid-template-columns: 1fr 1fr; margin-left: 200px; margin-top: -160px; - width: 400px; + width: 100%; } .card-body button { - margin-top: 15px; - margin-left: -10px; - width: 250px; + margin-top: 50px; + margin-right: 29px; + margin-left: -11px; + width: 240px; } .contracts { diff --git a/js/controllers/contracts.js b/js/controllers/contracts.js index 13eeac3..941379e 100644 --- a/js/controllers/contracts.js +++ b/js/controllers/contracts.js @@ -27,7 +27,8 @@ export default (temp_engine) => { contract.accept(() => { $(e.target).parent().children(".status-onhold").html("Status : accepté"); $(e.target).parent().children(".status-onhold").attr("class", 'status-accepted'); - $(e.target).remove(); + $(e.target).html("Contract accepted") + // $(e.target).remove(); }); } @@ -105,6 +106,7 @@ export default (temp_engine) => {

${contract.deadline}

Status : ${status}

Revenu : ${contract.paymentAccepted} $

+

@@ -113,7 +115,8 @@ export default (temp_engine) => { } $('.contracts').append(card); - console.log(contract) + $('.contracts').append(card); + }); diff --git a/js/skama_code b/js/skama_code index ca78318..7f51628 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit ca78318ca8fd3b58985edfe95a893632540b734f +Subproject commit 7f516288452f67f345be6b2eb8f4eb1137a7dd43