Update bootstrap CSS

2 files changed, 61 insertions, 40 deletions

diff --git a/views/calculator/setup.html b/views/calculator/setup.html
index e77c5cd1..e125eea9 100644
--- a/views/calculator/setup.html
+++ b/views/calculator/setup.html
@@ -11,35 +11,49 @@
   <body>
     <div class="container-fluid">
       <form id="setup" action="/calculator" method="get">
-        <h1>Bitcoin Point of Sale Calculator</h1>
+        <h1>Settings</h1>
 
         <input type="hidden" id="username" name="username" value="{{user}}" />
 
-        <label for="title">Title <small>(optional)</small>:</label>
-        <input type="text" id="title" name="title" />
+        <div class="form-group">
+          <label for="title">Store Name:</label>
+          <input type="text" id="title" name="title" class="form-control" />
+        </div>
 
-        <label for="logo">Logo <small>(optional, URL)</small>:</label>
-        <input type="text" id="logo" name="logo" />
+        <div class="form-group">
+          <label for="logo">Logo <small>(optional URL)</small>:</label>
+          <input type="text" id="logo" name="logo" class="form-control" />
+        </div>
 
-        <label for="address">Bitcoin Address:</label>
-        <input type="text" id="address" name="address" />
+        <div class="form-group">
+          <label for="address">Bitcoin Address:</label>
+          <input type="text" id="address" name="address" class="form-control" />
+        </div>
 
-        <label for="currency">Currency:</label>
-        <select id="currency" name="currency">
-        </select>
+        <div class="form-group">
+          <label for="currency">Currency:</label>
+          <select id="currency" name="currency" class="form-control">
+          </select>
+        </div>
 
-        <label for="symbol">Exchange:</label>
-        <select id="symbol" name="symbol">
-        </select>
+        <div class="form-group">
+          <label for="symbol">Exchange Rate:</label>
+          <select id="symbol" name="symbol" class="form-control">
+          </select>
+        </div>
         
-        <label for="commission">Commission <small>(optional, %)</small>:</label>
-        <input type="text" id="commission" name="commission" />
+        <div class="form-group">
+          <label for="commission">Commission/Discount <small>(optional %)</small>:</label>
+          <input type="text" id="commission" name="commission" class="form-control" />
+        </div>
 
-        <label for="password">Password <small>(blank = no change)</small>:</label>
-        <input type="text" id="password" name="password" />
+        <div class="form-group">
+          <label for="password">Password <small>(blank = no change)</small>:</label>
+          <input type="text" id="password" name="password" class="form-control" />
+        </div>
 
         <br />
-        <input class="btn" type="submit" value="Go" />
+        <input class="btn btn-primary" type="submit" value="Done" />
       </form>
     </div>
   </body>
diff --git a/views/calculator/show.html b/views/calculator/show.html
index b20f2737..db3cb698 100644
--- a/views/calculator/show.html
+++ b/views/calculator/show.html
@@ -16,35 +16,42 @@
         <h1 id="title"></h1>
         <img id="logo" src="img/logo.jpg" alt="Logo" />
 
-        <label for="exchange">Exchange Rate:</label>
-        <input type="text" id="exchange" value="0" disabled="disabled" />
-        <small id="symbol"></small>
+        <form role="form">
+          <div class="form-group">
+            <label for="exchange">Exchange Rate:</label>
+            <input type="text" id="exchange" value="0" disabled="disabled" class="form-control" />
+            <span id="symbol"></span>
+          </div>
 
-        <label for="amount">Amount:</label>
-        <input type="text" id="amount" />
-        <small id="currency"></small>
+          <div class="form-group">
+            <label for="amount">Amount:</label>
+            <input type="text" id="amount" class="form-control" />
+            <span id="currency"></span>
+          </div>
 
-        <label for="tip">Tip:</label>
-        <div class="btn-toolbar">
-          <div class="btn-group" id="tip">
-              <a id="tip0" class="btn tipSelect active" href="#"><i class="icon-align-left">0%</i></a>
-              <a id="tip10" class="btn tipSelect" href="#"><i class="icon-align-left">10%</i></a>
-              <a id="tip15" class="btn tipSelect" href="#"><i class="icon-align-center">15%</i></a>
-              <a id="tip20" class="btn tipSelect" href="#"><i class="icon-align-right">20%</i></a>
+          <div class="form-group">
+            <label for="tip">Tip:</label>
+            <div class="btn-toolbar">
+              <div class="btn-group" id="tip">
+                <button type="button" class="active btn btn-default">0%</button>
+                <button type="button" class="btn btn-default">10%</button>
+                <button type="button" class="btn btn-default">15%</button>
+                <button type="button" class="btn btn-default">20%</button>
+              </div>
+            </div>
           </div>
-        </div>
 
-        <br />
+          <br />
 
-        <div id="payment">
-          <p>Please send <strong id="total">0.0</strong> mBTC to</p><br />
-          <div id="qr"></div>
-          <p id="address"></p>
+          <div id="payment">
+            <p>Please send <strong id="total">0.0</strong> mBTC to</p><br />
+            <div id="qr"></div>
+            <p id="address"></p>
+          </div>
 
+          <span id="received" class="btn btn-success">Payment Received.  Thank you!</span>
         </div>
-
-        <span id="received" class="btn btn-success">Payment Received.  Thank you!</span>
-      </div>
+      </form>
 
       <span id="error" class="btn btn-danger" style="display: none"></span> 
     </div>