diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 74045f34e..4f57af1d6 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -9,17 +9,17 @@ ng-class="{'selected': item.id == index.walletId}" class="nav-item"> -
{{(item.name || item.id) | limitTo: 1}}
{{item.name || item.id}}
-
{{item.m}} of {{item.n}}
+
{{item.m}} of {{item.n}}
- +
  • - -
    + +
    Add wallet
    Create, join or import
    diff --git a/src/css/main.css b/src/css/main.css index 48e9e7a27..0a3482a51 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -379,7 +379,7 @@ ul.manage li { .m20v {margin:20px 0;} .m30a {margin: 30px auto;} .m-negative-l {margin-left: -0.9375rem;} -.br100 {border-radius: 100%;} +.br100 {border-radius: 100% !important;} .lh {line-height: 0;} .lh140 {line-height: 140%;} .oh {overflow:hidden;} @@ -408,9 +408,9 @@ ul.manage li { } .name-wallet { - color: #7A8C9E; font-size: 14px; - font-weight: 300; + font-weight: 400; + padding-top: 0 !important; } .tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 { @@ -418,7 +418,7 @@ ul.manage li { } .sidebar li.nav-item.selected .name-wallet { - font-weight: 700; + color: #fff; } .name-wallet i { diff --git a/src/css/mobile.css b/src/css/mobile.css index 66c46c51a..38de96102 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -271,17 +271,17 @@ a.missing-copayers { } .sidebar { - background: #fff; - box-shadow: inset -1px 0px 2px 0px rgba(0,0,0,0.20); + background: #2C3E50; + box-shadow: inset -2px 0px 1px 0px rgba(0,0,0,0.40); } .sidebar li { overflow: hidden; - border-bottom: 1px solid #f1f3f5; + border-bottom: 1px solid #384B5F; } .sidebar li.nav-item.selected { - background-color: #f1f3f5; + background-color: #122232; box-shadow: inset -1px 0px 1px 0px rgba(0,0,0,0.20); } @@ -291,22 +291,21 @@ a.missing-copayers { font-size: 20px; font-weight: 700; margin-right: 15px; - padding: 0.5rem 0.65rem; + padding: 0.33rem 0.65rem; line-height: 24px; text-align: center; float: left; - width: 40px; + width: 35px; + height: 35px; border-radius: 3px; } .sidebar header { - background-image: -webkit-linear-gradient(bottom, #213140 0%, #2C3E50 100%); - background-image: -o-linear-gradient(bottom, #213140 0%, #2C3E50 100%); - background-image: linear-gradient(to top, #213140 0%, #2C3E50 100%); width: 100%; text-align: center; height: 7rem; - padding: 1.3rem; + padding: 1.7rem; + border-bottom: 1px solid #384B5F; } .sidebar header h1 { @@ -325,11 +324,11 @@ a.missing-copayers { .sidebar ul.off-canvas-list li a { font-size: 12px; - vertical-align: middle; font-weight: 300; border-bottom: transparent; color: #A5B2BF; padding: 1rem 0.7rem; + line-height: 155%; } .sidebar ul.off-canvas-list li a i { diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 16459cbbf..4973c8c77 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -124,7 +124,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r var old = document.getElementById('menu-' + self.tab); if (old) { old.className = ''; - old.style.borderTopColor = ''; } } @@ -133,7 +132,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r var newe = document.getElementById('menu-' + tab); if (newe) { newe.className = 'active'; - newe.style.borderTopColor = self.backgroundColor; } }