From 878b6c7805d8a32b1228d800d0e446c734bccd24 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Tue, 25 Nov 2014 10:49:07 -0300
Subject: [PATCH 1/4] add style on bottom-bar

---
 css/src/main.css                     |  1 +
 css/src/mobile.css                   | 11 ++++++-----
 views/includes/bottombar-mobile.html |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 288b7cb24..584121791 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -557,6 +557,7 @@ a.button-setup {
 .oh {overflow:hidden;}
 .vm {vertical-align: middle;}
 .ma { margin: 0 auto;}
+.tu {text-transform: uppercase;}
 
 .small {
   font-size: 60%;
diff --git a/css/src/mobile.css b/css/src/mobile.css
index e5a32430f..a6002717e 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -45,7 +45,7 @@
     bottom: 0;
     width: 100%;
     z-index: 5;
-    background: #3C4E60;
+    background: #2C3E50;
   }
 
   .left-off-canvas-menu {
@@ -99,14 +99,15 @@
   }
 
   .bottombar-item a {
-    color: #fff;
-    padding: 4px 0;
+    color: #7A8C9E;
+    padding: 0.5rem 0;
     display: block;
   }
 
   .bottombar-item a.active {
-    color: #000;
-    background-color: #fff;
+    color: #E4E8EC;
+    background-color: #213140;
+    border-bottom: 3px solid #1ABC9C;
   }
 
   .box-founds {
diff --git a/views/includes/bottombar-mobile.html b/views/includes/bottombar-mobile.html
index 08436ba85..aa7925920 100644
--- a/views/includes/bottombar-mobile.html
+++ b/views/includes/bottombar-mobile.html
@@ -1,8 +1,8 @@
-<div class="row" ng-controller="SidebarController">
+<div class="row collapse" ng-controller="SidebarController">
     <div class="medium-3 small-3 columns text-center bottombar-item" data-ng-repeat="item in menu" ui-route="{{item.link}}" ng-if="item.link!='more'">
       <a href="#!/{{item.link}}" ng-class="{active: isActive(item)}"> 
-        <i class="size-24 {{item.icon}} db"></i> 
-        <div class="size-10">
+        <i class="size-36 {{item.icon}} db"></i> 
+        <div class="size-10 tu">
           {{item.title}} 
           <span class="label alert round" ng-if="item.link=='send' && $root.pendingTxCount > 0">{{$root.pendingTxCount}}</span>
         </div>

From e75505afcb319a0ad3b551e80d8b9d8da0d18dd6 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Tue, 25 Nov 2014 13:36:04 -0300
Subject: [PATCH 2/4] add style on Sidebar-mobile

---
 css/src/main.css                   |  5 +-
 css/src/mobile.css                 | 29 ++++++++---
 views/includes/sidebar-mobile.html | 83 +++++++++++++++++++-----------
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 584121791..6f80eb5c3 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -65,6 +65,7 @@ body, html{
 header {
   background-color: #1ABC9C;
   overflow: hidden;
+  height: 56px;
 }
 
 header .creation {
@@ -75,6 +76,7 @@ header .creation {
 
 header .alt-currency {
   background: #16A085;
+  color: #fff;
 }
 
 .panel h3, .box-setup h3 {
@@ -534,6 +536,7 @@ a.button-setup {
 .m20r {margin-right: 20px;}
 .m15r {margin-right: 15px;}
 .m20t {margin-top: 20px;}
+.m5 {margin: 5px;}
 .m10 {margin: 10px;}
 .m15 {margin: 15px;}
 .m15h {margin: 0 15px;}
@@ -564,7 +567,7 @@ a.button-setup {
   line-height: inherit;
 }
 
-.line-dashed-setup-v {
+.line-dashed-setuph-v {
   border-left: 1px dashed #415970;
 }
 
diff --git a/css/src/mobile.css b/css/src/mobile.css
index a6002717e..ad690f022 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -49,7 +49,8 @@
   }
 
   .left-off-canvas-menu {
-    background: #2C3E50;
+    background: #E4E8EC;
+    line-height: 24px;
   }
 
   .off-canvas-wrap,.inner-wrap{
@@ -89,9 +90,26 @@
   }
 
   ul.off-canvas-list li a {
+    text-transform: uppercase;
+    font-size: 12px;
+    vertical-align: middle;
+    font-weight: 100;
     border-bottom: transparent;
     padding: 0.66667rem 1rem;
-    color: #fff;
+    color: #7A8C9E;
+    border-top: 1px solid rgba(255,255,255,0.25);
+    -moz-box-shadow:    0px -1px 0px 0px rgba(165,178,191,0.15);
+    box-shadow:         0px -1px 0px 0px rgba(165,178,191,0.15);
+  }
+
+  ul.off-canvas-list li a i {
+    vertical-align: middle;
+  }
+
+  ul.off-canvas-list li a.wallet-item {
+    border: none;
+    -moz-box-shadow:    none;
+    box-shadow:         none;
   }
 
   ul.off-canvas-list li a i {
@@ -166,14 +184,11 @@
     margin-bottom: 50px;
   }
 
-  .founds {
-    color: #8597A7;
-  }
-
   .side-nav.wallets {
     padding: 0;
-    height: auto;
+    height: 100%;
     left: 0;
+    top: 56px;
   }
 
   ul.off-canvas-list li a:hover {
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index bcd29abf4..a243e611f 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -1,24 +1,39 @@
 <div ng-controller="SidebarController">
-  <header class="text-center">
-    <div class="text-white m10v">
-      <img src="img/logo-negative-beta.svg" alt="" width="80">
-      <div ng-include="'views/includes/version.html'"></div>
-    </div>
-
-  </header>
-  <div ng-if="$root.wallet" class="founds box-founds p15" ng-disabled="$root.loading">
+  <header>
     <div class="m10b" ng-click="toggleWalletSelection()">
-      <span>{{$root.wallet.getName()}} 
-        {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}
-      </span>
-      <a class="right text-gray">
-        <span ng-show="!walletSelection">
-          <i class="fi-arrow-down"></i>
-        </span>
-        <span ng-show="walletSelection">
-          <i class="fi-arrow-up"></i>
-        </span> 
-      </a>
+      <div class="col1">
+        <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
+      </div>
+      <div class="col2" ng-class="{'col2_full':!wallets.0}">
+        <div class="oh m5t m10r"> 
+          <div class="right size-10 text-white">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
+          <div class="name-wallet">
+            <div class="ellipsis">{{$root.wallet.getName()}}</div>
+          </div> 
+        </div>
+        <div class="founds size-12">
+          <span ng-if="!$root.wallet.isReady()">Waiting for copayers...</span>
+          <div ng-if="$root.wallet.isReady()">
+            <span ng-if="$root.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
+            <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 ng-if="alternativeBalanceAvailable" class="alt-currency">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
+              <span ng-if="!alternativeBalanceAvailable" class="alt-currency">N/A</span>
+            </div> 
+          </div>
+        </div>
+      </div>
+      <div class="col3" ng-if="wallets.0">
+        <a ng-class="{'selected':walletSelection}" 
+          ng-click="toggleWalletSelection()"> 
+          <span ng-show="!walletSelection">
+            <i class="icon-arrow-down2"></i>
+          </span>
+          <span ng-show="walletSelection">
+            <i class="icon-arrow-up2"></i>
+          </span> 
+        </a>
+      </div>
     </div>
     <div ng-if="walletSelection">
       <div class="side-nav wallets" ng-show="!wallets.0">
@@ -53,6 +68,8 @@
         </li>
       </ul>
     </div>
+  </header>
+  <!-- <div ng-if="$root.wallet" class="founds box-founds p15" ng-disabled="$root.loading">
     <div class="line-t" ng-show="!walletSelection" ng-click="refresh()">
       <a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
       <span ng-if="$root.updatingBalance">
@@ -71,14 +88,18 @@
         {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
       </span>
     </div>
-  </div>
+  </div> -->
 
-  <div class="line-t p0"></div>
-  <ul class="off-canvas-list" ng-show="!walletSelection">
-    <li>
-      <a href="#!/more" class="db p20h nav-item" title="Settings">
-        <i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a>
-    </li>
+  <a href="#!/profile" class="large-2 medium-2 columns text-center m30v" title="Profile">
+    <div class="photo-container">
+      <img gravatar-src="'{{username}}'" gravatar-size="35">
+    </div>
+    <p class="text-black m5"> bechilandia@gmail.com </p>
+    <span class="db p20h text-gray size-10" >
+      <i class="fi-torso"></i> {{'ViewProfile' | translate }} 
+    </span>
+  </a>
+  <ul class="off-canvas-list columns" ng-show="!walletSelection">
     <li>
       <a href="#!/create" class="db p20h nav-item" title="Create new wallet">
         <i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
@@ -89,17 +110,19 @@
     </li>
     <li>
     <a href="#!/import" class="db p20h nav-item" title="Import wallet">
-      <i class="size-24 m20r fi-download"></i> {{'Import wallet' | translate }} </a>
+      <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
     </li>
     <li>
-      <a href="#!/profile" class="db p20h nav-item" title="Profile">
-        <i class="size-24 m20r fi-torso"></i> {{'Profile' | translate }} </a>
+      <a href="#!/more" class="db p20h nav-item" title="Settings">
+        <i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a>
     </li>
     <li>
       <a href="#!/" class="db p20h nav-item" title="Close"
         ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
     </li>
   </ul>
-
+  <div class="text-gray size-10 text-center m20t columns">
+    <div ng-include="'views/includes/version.html'"></div>
+  </div>
 </div>
 

From ab4fc266fe922efc7fc630b3cf7b00f8ac94c6b2 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Tue, 25 Nov 2014 15:24:11 -0300
Subject: [PATCH 3/4] fix layout bugs

---
 css/src/main.css                   | 3 ++-
 css/src/mobile.css                 | 1 +
 views/includes/sidebar-mobile.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index 6f80eb5c3..d7f4a0790 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -65,7 +65,7 @@ body, html{
 header {
   background-color: #1ABC9C;
   overflow: hidden;
-  height: 56px;
+  height: 62px;
 }
 
 header .creation {
@@ -611,6 +611,7 @@ a.button-setup {
   width: 72%;
   float: left;
   color: #fff;
+  text-transform: lowercase;
 }
 
 .name-wallet i {
diff --git a/css/src/mobile.css b/css/src/mobile.css
index ad690f022..708f2306a 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -120,6 +120,7 @@
     color: #7A8C9E;
     padding: 0.5rem 0;
     display: block;
+    border-bottom: 3px solid transparent;
   }
 
   .bottombar-item a.active {
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index a243e611f..3124628ce 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -90,7 +90,7 @@
     </div>
   </div> -->
 
-  <a href="#!/profile" class="large-2 medium-2 columns text-center m30v" title="Profile">
+  <a href="#!/profile" class="columns text-center m30v" title="Profile">
     <div class="photo-container">
       <img gravatar-src="'{{username}}'" gravatar-size="35">
     </div>

From ae45c42babe54a26d493331b4c740b8207be1fdb Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 25 Nov 2014 16:24:01 -0300
Subject: [PATCH 4/4] fixes mobile

---
 css/src/main.css                   |  8 ---
 index.html                         |  2 +-
 views/includes/sidebar-mobile.html | 98 +++++++++++++-----------------
 views/includes/sidebar.html        |  3 +-
 4 files changed, 43 insertions(+), 68 deletions(-)

diff --git a/css/src/main.css b/css/src/main.css
index d7f4a0790..36b20f2ff 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -1149,14 +1149,6 @@ button.gray:focus,
   height: 100%;
 }
 
-.side-nav.wallets.medium {
-  height: 280px;
-}
-
-.side-nav.wallets.large {
-  height: 380px;
-}
-
 .side-nav.wallets a.wallet-item, 
 .side-nav.wallets a.wallet-item:hover {
   color: #7A8C9E;
diff --git a/index.html b/index.html
index 307d2b898..ad80194c2 100644
--- a/index.html
+++ b/index.html
@@ -65,7 +65,7 @@
           </section>
         </nav>
 
-        <aside class="left-off-canvas-menu">
+        <aside class="left-off-canvas-menu" ng-if="$root.iden">
           <div ng-include="'views/includes/sidebar-mobile.html'"></div>
         </aside>
 
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index 3124628ce..2a94fe18c 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -1,10 +1,10 @@
-<div ng-controller="SidebarController">
+<div ng-controller="SidebarController" ng-init="getWallets()">
   <header>
-    <div class="m10b" ng-click="toggleWalletSelection()">
+    <div ng-click="toggleWalletSelection()">
       <div class="col1">
         <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
       </div>
-      <div class="col2" ng-class="{'col2_full':!wallets.0}">
+      <div class="col2">
         <div class="oh m5t m10r"> 
           <div class="right size-10 text-white">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
           <div class="name-wallet">
@@ -23,9 +23,8 @@
           </div>
         </div>
       </div>
-      <div class="col3" ng-if="wallets.0">
-        <a ng-class="{'selected':walletSelection}" 
-          ng-click="toggleWalletSelection()"> 
+      <div class="col3">
+        <a ng-class="{'selected':walletSelection}"> 
           <span ng-show="!walletSelection">
             <i class="icon-arrow-down2"></i>
           </span>
@@ -35,13 +34,14 @@
         </a>
       </div>
     </div>
-    <div ng-if="walletSelection">
-      <div class="side-nav wallets" ng-show="!wallets.0">
-        <p class="size-12" translate>You do not have another wallets.</p>
+    <div ng-show="walletSelection">
+      <div class="side-nav wallets text-center off-canvas-list" ng-show="!wallets.0">
+        <p class="size-12 text-gray m10t" translate>You do not have another wallets.</p>
+        <a href="#!/create" class="db button secondary tiny" title="Create new wallet">
+        <i class="m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
       </div>
       <ul class="side-nav wallets off-canvas-list" ng-show="wallets.0"
-        ng-click="toggleWalletSelection()"
-        ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
+        ng-click="toggleWalletSelection()">
         <li data-ng-repeat="item in wallets track by $index"
           class="nav-item" 
           ng-if="item.id != $root.wallet.id">
@@ -69,60 +69,44 @@
       </ul>
     </div>
   </header>
-  <!-- <div ng-if="$root.wallet" class="founds box-founds p15" ng-disabled="$root.loading">
-    <div class="line-t" ng-show="!walletSelection" ng-click="refresh()">
-      <a class="side-bar text-gray right" title="Manual Refresh"><i class="fi-refresh"></i></a>
-      <span ng-if="$root.updatingBalance">
-        <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-      </span>
-      <span ng-if="!$root.updatingBalance">{{totalBalance || 0
-        |noFractionNumber}} {{$root.wallet.settings.unitName}} 
-      </span>
-    </div> 
-    <div class="m10t" ng-show="lockedBalance && !walletSelection" ng-click="refresh()">
-      {{'Locked'|translate}} 
-      <span ng-if="$root.updatingBalance">
-        <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-      </span>
-      <span ng-show="!$root.updatingBalance">
-        {{lockedBalance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
-      </span>
-    </div>
-  </div> -->
 
-  <a href="#!/profile" class="columns text-center m30v" title="Profile">
-    <div class="photo-container">
-      <img gravatar-src="'{{username}}'" gravatar-size="35">
+  <div ng-show="!walletSelection" ng-init="username = $root.iden.getName()">
+    <div class="off-canvas-list">
+    <a href="#!/profile" class="columns text-center m10v" title="Profile">
+      <div class="photo-container">
+        <img gravatar-src="'{{username}}'" gravatar-size="35">
+      </div>
+      <p class="text-black m5">{{username}}</p>
+      <span class="db text-gray size-10" >
+        <i class="fi-torso"></i> {{'ViewProfile' | translate }} 
+      </span>
+    </a>
     </div>
-    <p class="text-black m5"> bechilandia@gmail.com </p>
-    <span class="db p20h text-gray size-10" >
-      <i class="fi-torso"></i> {{'ViewProfile' | translate }} 
-    </span>
-  </a>
-  <ul class="off-canvas-list columns" ng-show="!walletSelection">
-    <li>
+    <ul class="off-canvas-list columns">
+      <li>
       <a href="#!/create" class="db p20h nav-item" title="Create new wallet">
         <i class="size-24 m20r fi-plus"></i> {{'Create new wallet' | translate }} </a>
-    </li>
-    <li>
-    <a href="#!/join" class="db p20h nav-item" title="Join shared wallet">
-      <i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }} </a>
-    </li>
-    <li>
-    <a href="#!/import" class="db p20h nav-item" title="Import wallet">
-      <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
-    </li>
-    <li>
+      </li>
+      <li>
+      <a href="#!/join" class="db p20h nav-item" title="Join shared wallet">
+        <i class="size-24 m20r fi-torsos-all"></i> {{'Join shared wallet' | translate }} </a>
+      </li>
+      <li>
+      <a href="#!/import" class="db p20h nav-item" title="Import wallet">
+        <i class="size-24 m20r fi-download"></i> {{'Import a wallet' | translate }} </a>
+      </li>
+      <li>
       <a href="#!/more" class="db p20h nav-item" title="Settings">
         <i class="size-24 m20r fi-widget"></i> {{'Settings' | translate }} </a>
-    </li>
-    <li>
+      </li>
+      <li>
       <a href="#!/" class="db p20h nav-item" title="Close"
         ng-click="signout()"><i class="size-24 m20r fi-power"></i> {{'Close'|translate}}</a>
-    </li>
-  </ul>
-  <div class="text-gray size-10 text-center m20t columns">
-    <div ng-include="'views/includes/version.html'"></div>
+      </li>
+    </ul>
+    <div class="text-gray size-12 text-center columns">
+      <div ng-include="'views/includes/version.html'"></div>
+    </div>
   </div>
 </div>
 
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html
index 2b1d78c37..704c1bcfa 100644
--- a/views/includes/sidebar.html
+++ b/views/includes/sidebar.html
@@ -50,8 +50,7 @@
   </div>
 
   <div>
-    <ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0"
-      ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
+    <ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0">
       <li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id" ng-click="switchWallet(item.id)">
         <div class="col1">
           <div class="avatar-wallet">{{(item.name || item.id) | limitTo: 1}}</div>