From 5df64c5f0be51a7b9440a2a41af6234fb1898cd2 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Mon, 2 Feb 2015 15:55:56 -0300
Subject: [PATCH 1/3] new home structure

---
 css/src/main.css      |  6 ++++
 css/src/mobile.css    | 26 +++++++++++-----
 views/homeWallet.html | 72 +++++++++++++++++++------------------------
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index a8b52a752..b1e3f04c9 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -248,6 +248,12 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
   color: #FFF;
 }
 
+.home-wallet .wallet-info {
+    margin-left: 0;
+    line-height: 110%;
+    float: left;
+  }
+
 .side-nav.wallets .avatar-wallet, 
 .wallet-selection.wallets .avatar-wallet
 {
diff --git a/css/src/mobile.css b/css/src/mobile.css
index f7504320c..e1f6fa707 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -143,6 +143,14 @@
     text-align: center;
   }
 
+  .amount {
+    background-color:  #F1F3F5;
+    width: 100%;
+    text-align: center;
+    padding: 2.4rem 1rem;
+    margin-bottom: 15px;
+  }
+
   .scroll-section {
     position: absolute;
     top: 120px;
@@ -184,15 +192,19 @@
     height:100%;   
   }
 
-  .avatar-wallet {
-    background-color: #1ABC9C;
-    color: #fff;
-    margin-top: 5px;
-    margin-left: 5px;
-    margin-right: 13px;
-    padding: 0.35rem 0.65rem;
+  .home-wallet .avatar-wallet {
+    padding: 1.7rem;
+    width: 90px;
+    height: 90px;
+    position: absolute;
+    top: -43px;
+    font-size: 35px;
+    border: 3px solid #fff;
   }
 
+  .home-wallet .wallet-info {
+    margin-left: 100px;
+  }
   
   .copayers {
     position: relative;
diff --git a/views/homeWallet.html b/views/homeWallet.html
index f412f3554..11c35da47 100644
--- a/views/homeWallet.html
+++ b/views/homeWallet.html
@@ -4,51 +4,43 @@
       <h1 translate>Home</h1>
     </div>
   </div>
-
+  
+  
   <div class="row">
-    <div class="large-12 columns">
+    <div class="columns">
       <div class="panel oh">
-        <div class="row p10b">
-          <div class="large-8 medium-6 small-4 columns">
-            <div class="oh">
-              <div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>
-              <h2 class="m10t ellipsis hide-for-small-only">
-                {{$root.wallet.getName()}} 
-              </h2>
-            </div>
-          </div>
-          <div class="large-4 medium-6 small-8 columns">
-            <div class="text-right">
-              <span class="size-21">
-                <strong>
-                  <span ng-if="!$root.updatingBalance">{{$root.wallet.balanceInfo.totalBalance || 0}}</span>
-              <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-              {{$root.wallet.settings.unitName}}
-              </strong>
-              </span>
-              <span class="size-14 db m5t text-gray">
-                <span ng-if="!$root.wallet.balanceInfo.updatingBalance && $root.wallet.balanceInfo.alternativeBalanceAvailable">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
-              <span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
-              <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-              </span>
-            </div>
-          </div>
+        <div class="amount hide-for-large-up">
+          <span class="size-36">
+            <strong>
+              <span ng-if="!$root.updatingBalance">{{$root.wallet.balanceInfo.totalBalance || 0}}</span>
+          <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+          {{$root.wallet.settings.unitName}}
+          </strong>
+          </span>
+          <span class="size-14 db m5t text-gray">
+            <span ng-if="!$root.wallet.balanceInfo.updatingBalance && $root.wallet.balanceInfo.alternativeBalanceAvailable">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
+          <span ng-if="!$root.wallet.balanceInfo.updatingBalance && !$root.wallet.balanceInfo.alternativeBalanceAvailable">N/A</span>
+          <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+          </span>
         </div>
-
-
-        <div class="row line-t">
-          <div class="small-4 medium-4 columns m5t size-12 hide-for-large-up">
-            <a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
-          </div>
-          <div class="small-8 medium-8 columns m5t">
-            <div class="text-right size-12">
-              <span ng-if="!$root.wallet.isShared()">Personal Wallet</span>
-              <span ng-if="$root.wallet.isShared()">
-                Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
-              </span>
-              <span ng-if="$root.wallet.isTestnet()"> in TESTNET</span>
+        <div class="pr">
+          <div class="avatar-wallet left">{{$root.wallet.getName() | limitTo: 1}}</div>      
+          <div class="wallet-info">
+              <p class="m0">
+                {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} 
+              </p>
+            <div class="size-12 text-gray">
+              <span ng-if="$root.wallet.isShared() && !$root.wallet.isTestnet()">Multisignature wallet </span>
+              <span ng-if="!$root.wallet.isShared() && !$root.wallet.isTestnet()">Personal Wallet</span>
+              <span ng-if="$root.wallet.isTestnet()"> Testnet</span>
             </div>
           </div>
+          <div class="right">
+            <a ng-click="$root.go('more')" class="button outline light-gray tiny m0">
+              <i class="fi-widget size-18 vm"></i>
+              <span class="show-for-medium-up">Settings</span>
+            </a>
+          </div>
         </div>
       </div>
     </div>

From 3a230e2763e8560aba979041a7370b80f9b2718c Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Mon, 2 Feb 2015 16:54:38 -0300
Subject: [PATCH 2/3] put copayers on setting & fix avatar wallet

---
 css/src/main.css             | 17 ++++++++++-------
 css/src/mobile.css           |  6 +++++-
 views/copayers.html          | 11 +++++++----
 views/homeWallet.html        |  9 ---------
 views/includes/copayers.html | 19 +++++++++----------
 views/more.html              | 13 +++++++++----
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index b1e3f04c9..1edd778a3 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -254,26 +254,29 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
     float: left;
   }
 
-.side-nav.wallets .avatar-wallet, 
-.wallet-selection.wallets .avatar-wallet
+.side-nav.wallets .avatar-wallet
 {
-  background-color: #1ABC9C;
-  color: #fff;
   padding: 0.35rem 0.5rem;
   text-align: center;
-  margin-top: 3px;
+  margin-top: 5px;
   width: 35px;
 }
 
+header .avatar-wallet {
+  background-color: #fff;
+  color: #1ABC9C;
+}
+
+
 .avatar-wallet {
+  background-color: #1ABC9C;
+  color: #fff;
   font-size: 20px;
   font-weight: 700;
   margin-top: 10px;
   margin-left: 10px;
   margin-right: 8px;
   padding: 0.5rem 0.65rem;
-  background-color: #fff;
-  color: #1ABC9C;
   line-height: 24px;
   text-align: center;
 }
diff --git a/css/src/mobile.css b/css/src/mobile.css
index e1f6fa707..f573c4202 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -333,9 +333,13 @@
     background: #E4E8EC;
   }
 
+  .sidebar-mobile-wallets .avatar-wallet {
+    margin-top: 5px;
+  }
+
   .sidebar-mobile-wallets li {
     overflow: hidden;
-    padding:0.4rem;
+    padding:.6rem 0.4rem;
     border-bottom: 1px solid #DDE2E7;
   }
 
diff --git a/views/copayers.html b/views/copayers.html
index 2a09dcfea..d499f210d 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -6,7 +6,7 @@
   </div>
 
   <div class="row">
-    <div class="large-12 columns">
+    <div class="large-8 columns">
 
       <div ng-if="!$root.wallet.isComplete()">
         <div class="panel oh">
@@ -35,18 +35,21 @@
           </div>
         </div>
       </div>
+    </div>
+    <div class="large-4 columns">
       <div class="panel oh">
         <h3>Waiting for copayers</h3>
         <div ng-include="'views/includes/copayers.html'"></div>
-        <div class="copay-box" ng-if="!$root.wallet.isComplete()">
-          <span ng-include="'views/includes/photo.html'"></span>
-          <p class="size-12 text-white text-light m0">
+        <div ng-if="!$root.wallet.isComplete()" class="m15t">
+          <div class="left m10r" ng-include="'views/includes/photo.html'"></div>
+          <p class="size-12 m0 m5t left mv">
             <i class="fi-loop icon-rotate spinner"></i>
             <span translate>Waiting...</span>
           </p>
         </div>
       </div>
     </div>
+    
   </div>
   <!-- end of row -->
   <div class="row">
diff --git a/views/homeWallet.html b/views/homeWallet.html
index 11c35da47..06b5f13cb 100644
--- a/views/homeWallet.html
+++ b/views/homeWallet.html
@@ -70,14 +70,5 @@
     </div>
   </div>
 
-  <div class="row" ng-if="$root.wallet.isShared()">
-    <!-- List of copayers -->
-    <div class="large-12 columns">
-      <div class="panel oh">
-        <h2 class="line-b" translate>Copayers</h2>
-        <div ng-include="'views/includes/copayers.html'"></div>
-      </div>
-    </div>
-  </div>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/views/includes/copayers.html b/views/includes/copayers.html
index be22ff6bb..3180d4b46 100644
--- a/views/includes/copayers.html
+++ b/views/includes/copayers.html
@@ -1,12 +1,11 @@
-<div>
-  <div class="copay-box" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
-    <div class="photo-container">
-      <img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
+<ul class="no-bullet m0">
+  <li class="oh m15t" ng-repeat="copayer in $root.wallet.getRegisteredPeerIds()">
+    <div class="left m10r" >
+      <div class="photo-container">
+        <img gravatar-src="'{{copayer.nick}}'" gravatar-size="35">
+      </div>
     </div>
-    <div
-      class="ellipsis"
-      tooltip="ID: {{copayer.peerId}}"
-      tooltip-placement="bottom">
+    <div class="left" 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>
@@ -14,5 +13,5 @@
         <i class="fi-check m5r"></i> {{copayer.nick}}
       </small>
     </div>
-  </div>
-</div>
+  </li>
+</ul>
\ No newline at end of file
diff --git a/views/more.html b/views/more.html
index a3b794679..227c46c98 100644
--- a/views/more.html
+++ b/views/more.html
@@ -22,9 +22,8 @@
       </div>
     </div>
   </form>
-
-  <div class="row" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
-    <div class="large-12 columns">
+  <div class="row">
+    <div class="large-8 columns" ng-init="isComplete = wallet.isComplete(); networkName = wallet.getNetworkName()">
       <h4>Wallet info</h4>
       <table>
         <tr>
@@ -49,10 +48,16 @@
         </tr>
       </table> 
     </div>
+    <div class="large-4 columns" ng-if="$root.wallet.isShared()">
+      <h4>Copayers</h4>
+      <div class="panel oh">
+        <div ng-include="'views/includes/copayers.html'"></div>
+      </div>
+    </div>
   </div>
 
   <div class="row" ng-show="!backupWalletPlainText && !error">
-    <div class="large-12 medium-12 small-12 columns">
+    <div class="large-8 medium-12 small-12 columns">
       <button class="primary expand" ng-click="downloadWalletBackup()" ng-disabled="loading"
         ng-show="!isSafari && !isCordova"><i class="fi-download"></i> Download backup</button>
       <button class="primary expand" ng-click="viewWalletBackup()" ng-disabled="loading"

From fc777eb8de5ded55d4231251b70aa92d11a8a89f Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Mon, 2 Feb 2015 16:59:56 -0300
Subject: [PATCH 3/3] remove setting on sidebar

---
 js/controllers/sidebar.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index cf074753f..78a5ef22a 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -21,10 +21,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
     'title': 'History',
     'icon': 'icon-history',
     'link': 'history'
-  }, {
-    'title': 'Settings',
-    'icon': 'icon-gear',
-    'link': 'more'
   }];
 
   $scope.signout = function() {