From 081f299a5425bebcae300396879712005e6c01bc Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Fri, 31 Oct 2014 15:17:39 -0300
Subject: [PATCH 1/3] fix home style

---
 css/src/main.css      |  13 ++++-
 views/homeWallet.html | 114 +++++++++++++++++++++---------------------
 2 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 007944bf6..79ac73219 100644
--- a/css/src/main.css
+++ b/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;
 }
 
@@ -246,6 +246,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;
diff --git a/views/homeWallet.html b/views/homeWallet.html
index d95152be2..c922d691e 100644
--- a/views/homeWallet.html
+++ b/views/homeWallet.html
@@ -1,70 +1,68 @@
-<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>
+    <h1 translate  class="hide-for-large-up">Home</h1> 
 
-   <!-- Wallet name and balance -->
-      <div>
-        <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>
+ <!-- Wallet name and balance -->
+    <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>
+        <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>
-  <br>
-  <br>
-
-  <!-- Address-->
-  <span translate>Quick receive</span>
-  <div>
-    <qrcode size="220" data="bitcoin:{{address.addressStr}}"></qrcode>
-
-    <div class="m10t">
-      <h4 class="size-12">{{address.addressStr}} <span class="btn-copy" clip-copy="address.addressStr"></span></h4>
-      <span ng-if="$root.updatingBalance">
-        <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-      </span>
-      <div class="small-10 columns small-centered">
-        <button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.addressStr)">
-          <i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
-        </button>
       </div>
     </div>
   </div>
-  <br>
-  <br>
-  <br>
 
-  <!-- List of copayers -->
-  <div>
-      <div class="copay-box" ng-repeat="copayer in copayersList()">
-        <img
-          class="br100 online"
-          src="./img/satoshi.gif"
-          alt="{{copayer.peerId}}"
-          width="70">
-        <div
-          class="ellipsis"
-          tooltip="ID: {{copayer.peerId}}"
-          tooltip-placement="bottom">
-          <small class="text-gray" ng-show="copayer.index == 0">
-            <i class="fi-check m5r"></i>{{'Me'|translate}}</small>
-          <small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
+  <!-- Address-->
+    <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>
+
+          <div class="m10t">
+            <h4 class="size-12">{{address.addressStr}} <span class="btn-copy" clip-copy="address.addressStr"></span></h4>
+            <span ng-if="$root.updatingBalance">
+              <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+            </span>
+            <div class="small-10 columns small-centered">
+              <button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.addressStr)">
+                <i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
+              </button>
+            </div>
+          </div>
         </div>
-        <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>
+ 
 
 
-</div>
+    <!-- List of copayers -->
+    <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"
+            src="./img/satoshi.gif"
+            alt="{{copayer.peerId}}"
+            width="70">
+          <div
+            class="ellipsis"
+            tooltip="ID: {{copayer.peerId}}"
+            tooltip-placement="bottom">
+            <small class="text-gray" ng-show="copayer.index == 0">
+              <i class="fi-check m5r"></i>{{'Me'|translate}}</small>
+            <small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
+          </div>
+          <div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
+        </div>
+      </div> 
+    </div>
 

From d8cd4240fa7205523dba7d1071d20e9e06bcd5e8 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Fri, 31 Oct 2014 15:21:52 -0300
Subject: [PATCH 2/3] fix copayers

---
 views/copayers.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/copayers.html b/views/copayers.html
index 12342f945..3c6b08631 100644
--- a/views/copayers.html
+++ b/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()">

From 93532254095e6029c7a9f84a53db1d8f85b3a2d5 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Fri, 31 Oct 2014 15:36:49 -0300
Subject: [PATCH 3/3] fix more section

---
 views/more.html | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/views/more.html b/views/more.html
index 471dc210c..03d72ad6b 100644
--- a/views/more.html
+++ b/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="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="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 class="large-6 columns">
+    <div class="panel oh">
+      <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>
   </div>
-  <p>
-    <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>