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] 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"