Merge pull request #3566 from bechi/feat/style-03

fix subheader & camera on send

public/views/includes/available-balance.html

@@ -1,15 +1,10 @@
 <div>
-    <div class="left" ng-show="index.lockedBalanceSat">
-        <i class="fi-info size-24 m10r"></i>
-    </div>
-    <div class="size-10">
-              <span class="db text-bold">
-                <span translate>Available Balance</span>:
-                {{index.availableBalanceStr }}
-              </span>
-              <span class="text-gray" ng-show="index.lockedBalanceSat">
-                {{index.lockedBalanceStr}}
-                <span translate>locked by pending payments</span>
-              </span>
-    </div>
+  <span class="db text-bold">
+    <span translate>Available Balance</span>:
+    {{index.availableBalanceStr }}
+  </span>
+  <span class="text-gray" ng-show="index.lockedBalanceSat">
+    {{index.lockedBalanceStr}}
+    <span translate>locked by pending payments</span>
+  </span>
 </div>

public/views/walletHome.html

@@ -265,20 +265,21 @@
 
     -->
     <div id="send" class="send tab-view">
-      <div>
+      <div class="pr">
         <h4 class="title m0">
-
-          <a class="right lh"
+          <available-balance></available-balance>
+          <a class="db"
             ng-if="index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
             ng-click="home.sendAll(index.availableMaxBalance, index.feeToSendMaxStr, index.feeRateToSendMax, index.currentFeeLevel)"
              translate> Send All
           </a>
-
-          <available-balance></available-balance>
         </h4>
+        <div class="camera-icon" ng-show="index.isComplete">
+          <qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner> 
+        </div>
       </div>
       <div class="row m20t">
-        <div class="large-12 large-centered columns">
+        <div class="large-12 large-centered columns m20t">
           <form name="sendForm" ng-submit="home.submitForm()" ng-disabled="home.blockUx || home.onGoingProcess" novalidate>
             <div class="box-notification" ng-show="home.error" ng-click="home.resetError()">
               <span class="text-warning">

src/css/main.css

@@ -49,17 +49,17 @@ h4 {
   box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.10);
   background: #fff;
   padding: 0.8rem;
-  text-transform: uppercase;
-  color: #2C3E50;
-  font-weight: 700;
-  font-size: 0.7rem;
+  color: #4B6178;
+  font-weight: 500;
+  font-size: 0.75rem;
   text-align: center;
+  line-height: 1.5;
+  min-height: 62px;
 }
 
 h4.title a {
   text-transform: none;
   font-weight: 400;
-  padding: 7px;
   font-size: 12px;
 }
 

src/css/mobile.css

@@ -219,16 +219,19 @@ _:-ms-fullscreen, :root .main {
 }
 
 .camera-icon a {
+  background: #4B6178;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.50);
   color: #fff;
   display: block;
   position: absolute;
-  background: #333;
-  border: 1px solid #666;
   padding: 15px 17px;
   border-radius: 100%;
-  top: -43px;
+  top: -40px;
   right: 15px;
-  opacity: 0.7;
+}
+
+.send .camera-icon a {
+  top: 32px;
 }
 
 .copayers {