fixes: layout of transactions, addresses and backups. Icon for qr-address. Hide box with shipping information

css/main.css

@@ -266,17 +266,19 @@ a:hover {
 }
 
 .last-transactions-header {
-  padding: 10px;
+  padding: 10px 0;
+  overflow: hidden;
 }
 
 .last-transactions-footer {
-  padding: 10px;
+  padding: 10px 0;
+  overflow: hidden;
 }
 
 .last-transactions-content {
   background-color: #FDFCFC;
   overflow: hidden;
-  padding: 10px;
+  padding: 10px 0;
 }
 
 .last-transactions-content .box-status {
@@ -285,9 +287,15 @@ a:hover {
 }
 
 .last-transactions-content .box-copayer {
-  width: 80px;
+  width: 60px;
   margin-right: 20px;
   float: left;
+  text-align: center;
+}
+
+.last-transactions-content .copayer-ico {
+  width: 30px;
+  height: 30px;
 }
 
 .last-transactions-content .box-copayer .icon-inactive {
@@ -629,7 +637,9 @@ input[type=number]::-webkit-outer-spin-button {
   color: #B4D455;
 }
 
-.success {background-color: #1ABC9C !important;}
+.success { 
+  color: #1ABC9C;
+}
 
 .dr-notification-text {
   font-size: 12px;

views/addresses.html

@@ -8,20 +8,25 @@
     <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
       <div class="large-12 medium-12" ng-init="showAll=0">
         <ul>
-          <li class="panel radius db" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
+          <li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
 
+            <div class="large-8 small-6 column">
+              <div class="ellipsis">
+                <a href="#" ng-click="openAddressModal(addr)"><i
+                class="fi-thumbnails">&nbsp;</i></a>
                 <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
                 <small ng-if="addr.isChange">change</small>
-            <a href="#" ng-click="openAddressModal(addr)">Show QR</a>
+              </div>
+            </div>
             
-            <span class="right">
+            <div class="large-4 small-6 column text-right">
               <span ng-if="$root.updatingBalance">
                 <i class="fi-bitcoin-circle icon-rotate spinner"></i>
               </span>
               <span ng-if="!$root.updatingBalance">
                 {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
               </span>
-            </span>
+            </div>
           </li>
         </ul>
 

views/backup.html

@@ -1,15 +1,15 @@
 <div class="backup" ng-controller="BackupController">
   <h1>Backup & Delete </h1>
-    <div class="oh large-9 columns panel">
+    <div class="oh large-12 columns panel">
       <h3><i class="fi-download m10r"></i> Backup </h3>
       <p class="large-8 columns text-gray"> Its important to back up your wallet so that you can recover your wallet in case of disaster </p>
       <div class="large-4 columns">
         <a class="button radius primary expand" ng-click="downloadBackup()">Download File</a>
       </div>
     </div>
-  <div class="large-9 columns line-dashed-h m15b"> </div>
+  <div class="large-12 columns line-dashed-h m15b"> </div>
   <div>
-    <div class="oh large-9 columns panel">
+    <div class="oh large-12 columns panel">
       <h3><i class="fi-minus-circle m10r"></i> Delete Wallet </h3>
       <p class="large-8 columns text-gray"> If all funds have been removed from your wallet and you do not wish to have the wallet data stored on your computer anymore, you can delete your wallet. </p>
       <div class="large-4 columns">

views/send.html

@@ -93,7 +93,7 @@
         </div>
 
         <div class="row">
-          <div class="large-5 columns">
+          <div class="large-5 medium-3 small-4 columns">
             <button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading" loading="Sending">
               Send
             </button>
@@ -102,7 +102,7 @@
       </form>
     </div>
 
-    <div class="large-6 columns">
+    <div class="large-6 columns show-for-large-up">
       <div class="send-note">
         <h6>Send to</h6>
         <p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">

views/transactions.html

@@ -1,26 +1,25 @@
 <div class="transactions" data-ng-controller="TransactionsController">
   <div ng-show='$root.wallet.isReady()'>
     <h1 ng-show="wallet.totalCopayers > 1"> Transaction proposals <small>({{txs.length}})</small></h1>
-    <div class="row">
+    <div class="large-12" ng-show="wallet.totalCopayers > 1">
-      <div class="large-12 columns" ng-show="wallet.totalCopayers > 1">
       <ul class="inline-list">
         <li> <a class="text-gray size-12" ng-click="show(true)" ng-disabled="loading || onlyPending" loading="Updating" ng-class="{'active' : onlyPending}"> [ Pending ] </a> </li>
         <li> <a class="text-gray size-12" ng-click="show()" ng-disabled="loading || !onlyPending" loading="Updating" ng-class="{'active' : !onlyPending}"> [ All ] </a> </li>
       </ul>
       <div class="last-transactions" ng-repeat="tx in txs | paged">
-          <div class="last-transactions-header row">
+        <div class="last-transactions-header">
           <div class="large-8 medium-8 small-12 columns">
-              <div class="row" ng-repeat="out in tx.outs">
+            <div ng-repeat="out in tx.outs">
-                <div class="large-3 medium-3 small-3 columns ellipsis">
+              <div class="large-3 medium-3 small-3 columns">
                 {{out.value | noFractionNumber}} {{$root.unitName}}</div>
-                <div class="large-1 medium-1 small-2 columns fi-arrow-right size-24"> </div>
+              <div class="large-1 medium-1 small-2 columns fi-arrow-right"> </div>
               <div class="large-8 medium-8 small-7 columns ellipsis">
                 <contact address="{{out.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
               </div>
             </div>
           </div>
           <div class="large-4 medium-4 small-12 columns text-right">
-              <h6>{{tx.createdTs | amCalendar}}</h6>
+            {{tx.createdTs | amCalendar}}
           </div>
         </div>
 
@@ -56,7 +55,7 @@
           </div>
         </div>
 
-          <div class="row last-transactions-footer">
+        <div class="last-transactions-footer">
           <div class="large-5 medium-5 columns" ng-show="!tx.sentTs">
             <div ng-show="!tx.signedByUs && !tx.rejectedByUs  && !tx.finallyRejected && tx.missingSignatures">
               <button class="secondary radius m10r"  ng-click="sign(tx.ntxid)" ng-disabled="loading" loading="Signing">
@@ -104,7 +103,6 @@
       <p ng-show="!onlyPending && txs.length == 0">No transactions proposals yet.</p>
       <pagination ng-show="!onlyPending && txs.length > txpItemsPerPage" total-items="txs.length" items-per-page="txpItemsPerPage" page="txpCurrentPage" on-select-page="show()" class="pagination-small primary"></pagination>
     </div>
-    </div>
 
     <h1 ng-class="{'line-dashed': wallet.totalCopayers > 1}">
       Last transactions 
@@ -113,8 +111,7 @@
       </small>   
     </h1>
 
-    <div class="row">
+    <div class="large-12">
-      <div class="large-12 columns">
       <div class="m10b size-12" ng-hide="wallet.totalCopayers == 1">
         <a class="text-gray active" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-hide="lastShowed && !loading">[ Show ]</a>
         <a class="text-gray" ng-click="toogleLast()" ng-disabled="loading" loading="Loading" ng-show="lastShowed && !loading">[ Hide ]</a>
@@ -126,7 +123,6 @@
         </div>
         <div class="last-transactions" ng-repeat="btx in blockchain_txs | orderBy: 'time':true">
           <div class="last-transactions-header">
-              <div class="row">
             <div class="large-8 columns">
               <a class="ellipsis" href="http://{{getShortNetworkName()}}.insight.is/tx/{{btx.txid}}" target="blank">
                 {{btx.txid}}
@@ -143,9 +139,7 @@
               </div>
             </div>
           </div>
-            </div>
           <div class="last-transactions-content">
-              <div class="row">
             <div class="large-5 medium-5 small-5 columns">
               <div ng-repeat="vin in btx.vinSimple">
                 <small class="right m5t">{{vin.value| noFractionNumber}} {{$root.unitName}}</small>
@@ -166,9 +160,7 @@
               </div>
             </div>
           </div>
-            </div>
           <div class="last-transactions-footer">
-              <div class="row">
             <div class="large-4 medium-4 small-4 columns">Fees: {{btx.fees | noFractionNumber}} {{$root.unitName}}</div>
             <div class="large-4 medium-4 small-4 columns text-center">Confirmations: {{btx.confirmations || 0}}</div>
             <div class="large-4 medium-4 small-4 columns text-right">Total: {{btx.valueOut| noFractionNumber}} {{$root.unitName}}</div>
@@ -177,7 +169,5 @@
       </div>
     </div>
   </div>
-    </div>
-  </div>
 </div>