Affichage des promesses de dons

diff --git a/Donnez.html b/Donnez.html
index 658fa6ff0af87e04b0ab68cec214d9e10fb48888..d1c0e5e4f4dfc7e3629f96301dd0af939926a6ee 100644 (file)
--- a/Donnez.html
+++ b/Donnez.html
@@ -12,7 +12,7 @@
 
 <div class="progress-bar-wrapper" data-total='[[!inline pagenames="data/budget-total" raw="yes"]]€'>
     <div class="progress-bar" style='width: [[!inline pagenames="data/pourcentage-budget" raw="yes"]];' data-current='[[!inline pagenames="data/budget-current" raw="yes"]]€'></div>
 
 <div class="progress-bar-wrapper" data-total='[[!inline pagenames="data/budget-total" raw="yes"]]€'>
     <div class="progress-bar" style='width: [[!inline pagenames="data/pourcentage-budget" raw="yes"]];' data-current='[[!inline pagenames="data/budget-current" raw="yes"]]€'></div>

-    <div class="progress-bar-promises" style='width: [[!inline pagenames="data/pourcentage-promesses" raw="yes"]];' data-current='[[!inline pagenames="data/budget-promises" raw="yes"]]€'></div>
+    <div class="progress-bar progress-bar-promises" style='width: [[!inline pagenames="data/pourcentage-promesses" raw="yes"]];left: [[!inline pagenames="data/pourcentage-budget" raw="yes"]];background-position: [[!inline pagenames="data/budget-promises-style" raw="yes"]];' data-current='[[!inline pagenames="data/budget-promises" raw="yes"]]€'></div>

 </div>
 <p>
 Un oignon correspond à 1 mois de fonctionnement.
 </div>
 <p>
 Un oignon correspond à 1 mois de fonctionnement.

diff --git a/assets/progress_bar.png b/assets/progress_bar.png
index cfc603517d011b0d0a2d6e288e1d5f09ac0ccb76..8ddeb890591a2d257967717f3cc93a0e6c12e982 100644 (file)
Binary files a/assets/progress_bar.png and b/assets/progress_bar.png differ

diff --git a/local.css b/local.css
index 27c5c013050e358ea2978ad378aa9253370abda9..78297cd8e95f157e6c55e4720fd07953f61c733a 100644 (file)
--- a/local.css
+++ b/local.css
@@ -401,12 +401,15 @@ thead td {
   .progress-bar-wrapper .progress-bar {
     position: absolute;
     height: 85px;
   .progress-bar-wrapper .progress-bar {
     position: absolute;
     height: 85px;

-    background: grey url(assets/progress_bar.png) bottom left repeat-x;
+    background: grey url(assets/progress_bar.png) left -85px repeat-x;

     /* animate progress bar */
     -webkit-animation: progress-bar 1.5s;
     -moz-animation: progress-bar 1.5s;
     animation: progress-bar 1.5s;
   }
     /* animate progress bar */
     -webkit-animation: progress-bar 1.5s;
     -moz-animation: progress-bar 1.5s;
     animation: progress-bar 1.5s;
   }

+  .progress-bar-wrapper .progress-bar-promises {
+    background: grey url(assets/progress_bar.png) left bottom repeat-x;
+  }

 
   /* progress bar animation*/
   @-webkit-keyframes progress-bar { 0% { width: 0; } }
 
   /* progress bar animation*/
   @-webkit-keyframes progress-bar { 0% { width: 0; } }


@@ -424,6 +427,9 @@ thead td {
     color: #ccc;
     font-size: 0.9em;
   }
     color: #ccc;
     font-size: 0.9em;
   }

+  /* Promises amount */
+  .progress-bar-wrapper .progress-bar-promises:after {
+  }

 
   /* Temperature bar */
   .progress-bar-wrapper:before {
 
   /* Temperature bar */
   .progress-bar-wrapper:before {