From b941a93bfe658a6eec9d8a45bdaaa671abd7698c Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Tue, 16 Dec 2014 16:18:28 -0300
Subject: [PATCH] fix send form

---
 css/src/main.css   | 22 +++++++++----
 css/src/mobile.css |  2 +-
 views/send.html    | 77 ++++++++++++++++++++--------------------------
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 39d913e8e..014275423 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -946,6 +946,7 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
   box-shadow: none;
   border: none;
   padding-left: 45px;
+  font-size: 13px;
 }
 
 /* SECONDARY */
@@ -1115,14 +1116,19 @@ ul.wallet-selection.wallets {
   color: #fff;
 }
 
-label.postfix, span.postfix {
-  height: 40px;
+label.postfix, a.postfix {
+  height: 100%;
   border: none;
-  background-color: #DFE5EB;
   font-weight: 700;
-  font-size: 10px;
-  color: #7A8C9E;
+  font-size: 12px;
+  color: #fff;
   text-transform: uppercase;
+  background: #7A8C9E;
+  border-radius: 0 2px 2px 0;
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 50px;
 }
 
 .photo-container {
@@ -1216,7 +1222,7 @@ label.postfix, span.postfix {
 
 .input { position: relative;}
 
-.input i {
+.createProfile .input i, .home .input i {
   position: absolute;
   top: 10px;
   left: 10px;
@@ -1234,6 +1240,10 @@ label.postfix, span.postfix {
   padding: 0;
 }
 
+.send input[type=text], .send input[type=number], .send textarea {
+  padding: 0.5rem;
+}
+
 .icon-input {
   font-size: 9px;
   color: #fff;
diff --git a/css/src/mobile.css b/css/src/mobile.css
index 94e709756..d695d2d35 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -24,7 +24,7 @@
 
   .main {
     height: 92%;
-    margin-top: 30px;
+    margin-top: 45px;
     margin-left: 0;
     margin-bottom: -30px;
     padding: 20px 0 80px 0;
diff --git a/views/send.html b/views/send.html
index 7cc56d797..e5b99cf4e 100644
--- a/views/send.html
+++ b/views/send.html
@@ -1,8 +1,16 @@
 <div class="send" ng-controller="SendController" ng-init="init()">
 
-  <div class="row">
-    <div class="large-12 medium-12 small-12 columns">
-      <h1 class="hide-for-large-up">{{$root.title}}</h1>
+  <div class="row hide-for-large-up" >
+    <div class="large-10 medium-10 small-9 columns">
+      <h1>{{$root.title}}</h1>
+    </div>
+    <div class="large-2 medium-2 small-3 columns">
+      <div ng-hide="showScanner || disableScanner">
+        <a class="button right m10b radius tiny black" ng-click="openScanner()"><i class="fi-camera size-18"></i></a>
+      </div>
+      <div ng-show="showScanner">
+        <a translate class="button right radius tiny m10b warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i></a>
+      </div>
     </div>
   </div>
 
@@ -22,7 +30,7 @@
   </div>
 
   <div class="row" ng-show="!fetchingURL">
-    <div class="large-12 columns">
+    <div class="large-8 large-centered columns">
       <form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
         <div class="panel">
           <div class="box-notification" ng-show="error">
@@ -66,13 +74,7 @@
 
             <div class="input">
               <input type="text" id="address" name="address" ng-disabled="loading || lockAddress" placeholder="{{'Bitcoin address'|translate}}" ng-model="_address" valid-address required>
-              <label for="address"><i class="fi-address-book"></i> </label>
-              <div ng-hide="showScanner || disableScanner">
-                <a class="postfix button black" ng-click="openScanner()"><i class="fi-camera size-24"></i></a>
-              </div>
-              <div ng-show="showScanner">
-                <a translate class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i></a>
-              </div>
+              <a class="postfix" ng-click="openAddressBook()"><i class="fi-address-book size-24"></i></a>
             </div>
             <div id="scanner" class="row" ng-if="showScanner" ng-include="'views/includes/scanner.html'">
             </div>
@@ -103,36 +105,21 @@
                 </small>
               </div>
               <div ng-show="!showAlternative">
-                <div class="row collapse">
 
-                  <label for="amount">
-                    <span translate>Amount</span>
-                  </label>
+              <label for="amount">
+                <span translate>Amount</span>
+              </label>
 
-                  <div class="small-9 columns">
-                    <div class="input">
-                      <input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off">
-                      <label for="amount"><i class="icon-bitcoin"></i></label>
-                    </div>
-                  </div>
-                  <div class="small-3 columns pointer" ng-click="showAlternative = true">
-                    <span class="postfix">{{$root.wallet.settings.unitName}}</span>
-                  </div>
-                </div>
+              <div class="input">
+                <input type="number" id="amount" ng-disabled="loading || lockAmount" name="amount" placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off">
+                <a class="postfix" ng-click="showAlternative = true">{{$root.wallet.settings.unitName}}</a>
               </div>
               <div ng-show="showAlternative">
-                <div class="row collapse">
-                  <label for="alternative"><span translate>Amount in</span> {{ alternativeName }}
-                  </label>
-                  <div class="small-9 columns">
-                    <div class="input">
-                      <input type="number" id="alternative" ng-disabled="loading || !isRateAvailable || lockAmount" name="alternative" placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off">
-                      <label for="alternative"><i class="icon-usd"></i></label>
-                    </div>
-                  </div>
-                  <div class="small-3 columns pointer" ng-click="showAlternative = false">
-                    <span class="postfix">{{alternativeIsoCode}}</span>
-                  </div>
+                <label for="alternative"><span translate>Amount in</span> {{ alternativeName }}
+                </label>
+                <div class="input">
+                  <input type="number" id="alternative" ng-disabled="loading || !isRateAvailable || lockAmount" name="alternative" placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off">
+                  <a class="postfix" ng-click="showAlternative = false"> {{ alternativeName }}</a>
                 </div>
               </div>
             </div>
@@ -145,21 +132,25 @@
               </label>
               <div class="input">
                 <textarea id="comment" ng-disabled="loading" name="comment" placeholder="{{($root.wallet.isShared() ? 'Leave a private message to your copayers' : 'Add a private comment to identify the transaction')}}" ng-maxlength="100" ng-model="_comment"></textarea>
-                <label for="comment"><i class="icon-reference"></i></label>
               </div>
             </div>
           </div>
 
           <div class="row">
-            <div class="large-6 medium-6 small-6 columns text-left">
-              <a class="button tiny secondary m0 radius" title="Address book" ng-hide="_merchantData || lockAddress" ng-click="openAddressBook()">
-                <i class="fi-address-book size-14 m5r vm"></i> Address book
-              </a>
+            <div class="large-6 medium-6 small-12 columns text-left">
+              <div class="show-for-large-up">
+                <div ng-hide="showScanner || disableScanner">
+                  <a class="button radius tiny black" ng-click="openScanner()"><i class="fi-camera size-18 vm m5r"></i> Scan QR </a>
+                </div>
+                <div ng-show="showScanner">
+                  <a translate class="button radius tiny warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i> </a>
+                </div>
+              </div>
               <a ng-click="resetForm()" class="button warning m0" ng-show="_merchantData || lockAddress" ng-disabled="loading">
                   Cancel
                 </a>
             </div>
-            <div class="large-4 medium-4 small-6 columns text-right">
+            <div class="large-6 medium-6 small-12 columns text-right">
               <button type="submit" class="button primary m0 expand" ng-disabled="sendForm.$invalid || loading">
                 <i class="fi-bitcoin-circle icon-rotate spinner" ng-show="loading"></i> Send
               </button>