From fb362df582a5337712870a53d442852b99e63131 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 5 Aug 2016 15:26:27 -0300
Subject: [PATCH] adjustment to last design

---
 public/views/modals/inputAmount.html     | 55 ++++++++++++------------
 src/js/controllers/modals/inputAmount.js |  8 ++--
 src/sass/main.scss                       | 10 +++--
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/public/views/modals/inputAmount.html b/public/views/modals/inputAmount.html
index 387a3d812..5eff1c7e6 100644
--- a/public/views/modals/inputAmount.html
+++ b/public/views/modals/inputAmount.html
@@ -14,52 +14,53 @@
 
   <ion-content>
     <div ng-show="!specificAmount">
-      <div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
-        <div class="size-48" ng-class="{'small-font': smallFont}">{{amount || '-'}}</div>
-        <div class="size-21 text-light" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || '0.00'}} {{alternativeIsoCode}}]</div>
-        <div class="size-21 text-light" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || '0.00'}} {{unitName}}]</div>
-      </div>
-
-      <div class="button-content text-center size-10 df">
-        <button class="button button-amount expand button-stable" ng-click="pushOperator('x')">x</button>
-        <button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
-        <button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
-        <button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
+      <div class="send-amount ">
+        <div class="size-36 text-light text-black m15t" ng-class="{'small-font-amount': smallFont}">{{amount || '-'}}</div>
+        <div class="size-17 text-light text-black" ng-class="{'small-font-result': smallFont}" ng-show="!showAlternativeAmount">{{globalResult}} [{{amountResult || '0.00'}} {{alternativeIsoCode}}]</div>
+        <div class="size-17 text-light text-black" ng-show="showAlternativeAmount">{{globalResult}} [{{alternativeResult || '0.00'}} {{unitName}}]</div>
       </div>
 
       <div class="m10b">
         <div class="button-content text-center df">
-          <button class="button expand button-light" ng-click="pushDigit('1')">1</button>
-          <button class="button expand button-light" ng-click="pushDigit('2')">2</button>
-          <button class="button expand button-light" ng-click="pushDigit('3')">3</button>
-        </div>
-        <div class="button-content text-center df">
-          <button class="button expand button-light" ng-click="pushDigit('4')">4</button>
-          <button class="button expand button-light" ng-click="pushDigit('5')">5</button>
-          <button class="button expand button-light" ng-click="pushDigit('6')">6</button>
+          <div class="col col-25 col-offset-50">
+            <button class="button expand button-stable" ng-click="resetAmount()">AC</button>
+          </div>
+          <div class="col col-25">
+            <button class="button expand text-center" ng-style="{'background-color':index.backgroundColor}"
+              ng-disabled="alternativeResult <= 0 && amountResult <= 0" ng-click="finish()" ng-show="!specificAmount">
+              <span>Ok</span>
+            </button>
+          </div>
         </div>
         <div class="button-content text-center df">
           <button class="button expand button-light" ng-click="pushDigit('7')">7</button>
           <button class="button expand button-light" ng-click="pushDigit('8')">8</button>
           <button class="button expand button-light" ng-click="pushDigit('9')">9</button>
+          <button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
+        </div>
+        <div class="button-content text-center df">
+          <button class="button expand button-light" ng-click="pushDigit('4')">4</button>
+          <button class="button expand button-light" ng-click="pushDigit('5')">5</button>
+          <button class="button expand button-light" ng-click="pushDigit('6')">6</button>
+          <button class="button button-amount expand button-stable" ng-click="pushOperator('x')">x</button>
+        </div>
+        <div class="button-content text-center df">
+          <button class="button expand button-light" ng-click="pushDigit('1')">1</button>
+          <button class="button expand button-light" ng-click="pushDigit('2')">2</button>
+          <button class="button expand button-light" ng-click="pushDigit('3')">3</button>
+          <button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
         </div>
         <div class="button-content text-center df">
           <button class="button expand button-light" ng-click="pushDigit('.')">.</button>
           <button class="button expand button-light" ng-click="pushDigit('0')">0</button>
           <button class="button expand button-light" ng-click="removeDigit()"><</button>
+          <button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
         </div>
       </div>
 
       <div class="row m20t">
         <div class="columns">
-          <button class="round expand m0"
-            ng-style="{'background-color':index.backgroundColor}"
-            ng-disabled="alternativeResult <= 0 && amountResult <= 0"
-            ng-click="finish()"
-            ng-show="!specificAmount">
-            <span translate ng-show="!address">Ok</span>
-            <span translate ng-show="address">Generate QR Code</span>
-          </button>
+
         </div>
       </div>
     </div>
diff --git a/src/js/controllers/modals/inputAmount.js b/src/js/controllers/modals/inputAmount.js
index 77dd77726..281b7b777 100644
--- a/src/js/controllers/modals/inputAmount.js
+++ b/src/js/controllers/modals/inputAmount.js
@@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
     unitToSatoshi = config.unitToSatoshi;
     satToUnit = 1 / unitToSatoshi;
     unitDecimals = config.unitDecimals;
-    resetAmount();
+    $scope.resetAmount();
   };
 
   $scope.shareAddress = function(uri) {
@@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
 
   $scope.removeDigit = function() {
     if ($scope.amount.toString().length == 1) {
-      resetAmount();
+      $scope.resetAmount();
       return;
     }
 
@@ -88,14 +88,14 @@ angular.module('copayApp.controllers').controller('inputAmountController', funct
     checkFontSize();
   };
 
-  function resetAmount() {
+  $scope.resetAmount = function() {
     $scope.amount = $scope.alternativeResult = $scope.amountResult = $scope.globalResult = '';
     checkFontSize();
   };
 
   function processAmount(val) {
     if (!val) {
-      resetAmount();
+      $scope.resetAmount();
       return;
     }
 
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 5d6c62692..a89ec1499 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -99,8 +99,12 @@ h4.title a {
   }
 }
 
-.small-font {
-  font-size: 34px !important;
+.small-font-amount {
+  font-size: 28px !important;
+}
+
+.small-font-result {
+  font-size: 16px !important;
 }
 
 .modal-content h4, .glidera h4, .coinbase h4 {
@@ -1585,7 +1589,7 @@ input.ng-invalid-match {
   text-align: center;
   padding-top: 10px;
   color: #fff;
-  height: 150px;
+  height: 125px;
 }
 
 .alternative-amount {