Merge pull request #1651 from bechi/bugs/ui-10

fix home style

css/src/main.css

@@ -80,7 +80,7 @@
   font-family: 'Ubuntu', Helvetica, sans-serif !important;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .panel h2 {
   color: #2C3E50;
 }
 
@@ -250,6 +250,17 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
   -webkit-box-shadow: 0 0 0px 1000px white inset;
 }
 
+.home-wallet .avatar-wallet {
+  background: #1ABC9C;
+  margin: 0;
+  width: 45px;
+  height: 45px;
+  font-size: 30px;
+  padding-top: 10px;
+  margin-right: 15px;
+  color: #FFF;
+}
+
 .side-nav.wallets .avatar-wallet{
   background-color: #7A8C9E;
   color: #213140;

views/copayers.html

@@ -18,7 +18,7 @@
             </div>
           </div>
         </div>
-        <div class="box-setup-copayers p20">
+        <div class="panel p20">
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
             <div ng-if="!$root.wallet.isReady()">

views/homeWallet.html

@@ -1,25 +1,28 @@
-<div class="addresses" ng-controller="HomeWalletController">
+<div class="home-wallet" ng-controller="HomeWalletController">
   <div ng-show='$root.wallet.isReady()'>
     <h1 translate  class="hide-for-large-up">Home</h1> 
-      <br>
-      <br>
 
  <!-- Wallet name and balance -->
-      <div>
+    <div class="panel large-12 columns">
+      <div class="row collapse">
+        <div class="large-1 columns">
           <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
-        <div class="ellipsis">{{$root.wallet.getName()}}</div>
-        <div ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
-              <b class="m5r">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
-              <span class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
         </div>
-
+        <div class="large-9 columns">
+          <h2 class="ellipsis m10t">{{$root.wallet.getName()}}</h2>
+        </div>
+        <div class="large-2 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
+          <b class="db m5b size-24">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
+          <span class="size-14 m5t text-gray">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
+        </div>
+      </div>
     </div>
   </div>
-  <br>
-  <br>
 
   <!-- Address-->
-  <span translate>Quick receive</span>
+    <div class="large-6 columns">
+      <div class="panel oh">
+        <h2 class="line-b" translate>Quick receive</h2>
         <div>
           <qrcode size="220" data="bitcoin:{{address.addressStr}}"></qrcode>
 
@@ -35,12 +38,15 @@
             </div>
           </div>
         </div>
-  <br>
+      </div>
-  <br>
+    </div>
-  <br>
+ 
+
 
     <!-- List of copayers -->
-  <div>
+    <div class="large-6 columns">
+      <div class="panel oh">
+        <h2 class="line-b" translate>Copayers</h2>
         <div class="copay-box" ng-repeat="copayer in copayersList()">
           <img
             class="br100 online"
@@ -58,13 +64,5 @@
           <div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
         </div>
       </div> 
-<!--   <br>
-  <br>
-  <br>  <!-- Last transactions
-    <div>
-      <span translate>Last transactions</span>
-     </div>  -->
-
-
     </div>
 

views/more.html

@@ -1,6 +1,21 @@
 <div class="backup" ng-controller="MoreController">
   <h1 class="hide-for-large-up">{{$root.title}} </h1>
-  <div class="large-12 columns panel">
+  <div class="row collapse">
+    <form name="settingsForm" class="large-6 small-12 columns">
+      <fieldset>
+        <legend translate>Wallet Unit</legend>
+        <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" ng-change="save()">
+        </select>
+      </fieldset>
+      <fieldset>
+        <legend translate>Alternative Currency</legend>
+        <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" ng-change="save()">
+        </select>
+      </fieldset>
+    </form>
+  </div>
+  <div class="large-12 columns line-dashed-h m15b"></div>
+  <div class="large-6 columns panel">
     <h2><i class="fi-download m10r"></i> <span translate>Backup</span> </h2>
     <p translate class="text-gray">
       It's important to backup your wallet so that you can recover it in case of disaster
@@ -20,31 +35,16 @@
       <div translate class="m10t size-12 text-gray text-right">Copy this text as it is in a safe place (notepad or email)</div>
     </div>
   </div>
-  <div class="large-12 columns line-dashed-h m15b"></div>
+  <div class="large-6 columns">
-  <div class="row collapse">
+    <div class="panel oh">
-    <form name="settingsForm" class="large-6 small-12 columns">
-      <fieldset>
-        <legend translate>Wallet Unit</legend>
-        <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" ng-change="save()">
-        </select>
-      </fieldset>
-      <fieldset>
-        <legend translate>Alternative Currency</legend>
-        <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" ng-change="save()">
-        </select>
-      </fieldset>
-    </form>
-  </div>
-  <div class="large-12 columns line-dashed-h m15b"></div>
-  <div class="oh large-12 columns panel">
       <h3><i class="fi-minus-circle m10r"></i> <span translate> Delete Wallet </span></h3>
       <p translate 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">
         <a translate class="button warning expand" ng-really-message="{{'Are you sure to delete this wallet from this computer?'|translate}}" ng-really-click="deleteWallet()"> Delete</a>
       </div>
     </div>
-  <p>
+  </div>
-    <a class="expand small" ng-click="hideAdv=!hideAdv">
+    <a class="large-12 columns small" ng-click="hideAdv=!hideAdv">
       <i class="fi-widget m3r"></i>
       <span translate ng-hide="!hideAdv">Show</span> 
       <span translate ng-hide="hideAdv">Hide</span>