Merge branch 'master' of https://github.com/asoltys/bitcoin_pos

3 files changed, 17 insertions, 13 deletions

diff --git a/css/bitcoin_pos.css b/css/bitcoin_pos.css
index b97f586d..967eb9c2 100644
--- a/css/bitcoin_pos.css
+++ b/css/bitcoin_pos.css
@@ -1,12 +1,13 @@
 body { text-align: center; }
-body, input[type="text"], span.btn { font-size: 24px; height: 30px; line-height: 24px; }
-small, label { font-size: 24px; color: #999; line-height: 24px; }
-strong#total { font-size: 30px; }
+body { font-size: 100%; line-height: 100%; }
+input[type="text"], span.btn { font-size: 1.5em; height: 1.5em; width: 5em; }
+p, span { font-size: 1.5em; }
+small, label { color: #999; font-size: 1.2em; }
+strong#total { font-size: 2em; }
 input[type="submit"] { display: none; }
-canvas { margin-left: 90px; }
+img#banner { width: 100%; }
 	
 div.container-fluid {
-  width: 600px;
   margin-left: auto;
   margin-right: auto;
   text-align:left;
diff --git a/index.html b/index.html
index 91d77cf9..9661be98 100644
--- a/index.html
+++ b/index.html
@@ -20,8 +20,8 @@
       <input type="text" id="exchange" value="0" disabled="disabled" />
       <small>CAD / BTC</small>
 
-      <label for="owing">Amount:</label>
-      <input type="text" id="owing" value="0" />
+      <label for="amount">Amount:</label>
+      <input type="text" id="amount" value="0" />
       <small>CAD</small>
 
       <br /><br />
diff --git a/js/bitcoin_pos.js b/js/bitcoin_pos.js
index 753f4074..6dcf49ce 100644
--- a/js/bitcoin_pos.js
+++ b/js/bitcoin_pos.js
@@ -6,6 +6,8 @@ $(function() {
   var address = getParameterByName('address');
   
   $('#received').hide();
+  $('div.container-fluid').css('width', screen.width.toString() + 'px');
+  $('div.container-fluid').css('width', 600 + 'px');
 
   setupqr();
 
@@ -59,23 +61,24 @@ $(function() {
     updateTotal();
   });
 
-  $('#owing').keyup(updateTotal);
-  $('#owing').focus();
-  $('#owing').click(function() {
+  $('#amount').keyup(updateTotal);
+  $('#amount').focus();
+  $('#amount').focus(function() {
     $('#payment').show();
     $('#received').hide();
+    $('#total').html('0');
+    $(this).val('');
   });
 
   function updateTotal() {
-    var owing = parseFloat($('#owing').val());
-    total = owing / exchange;
+    var amount = parseFloat($('#amount').val());
+    total = amount / exchange;
     total = Math.ceil(total * 10000) / 10000;
     if (!$.isNumeric(total)) total = '';
     $('#total').html(total.toString());
     doqr('bitcoin:' + address + '?amount=' + total.toString());
   }
 
-  $('input').click(function() { $(this).val(''); });
 });
 
 function getParameterByName(name) {