{{ (index.alias || index.walletName) | limitTo: 1}}
+ ng-style="{'background-color':index.backgroundColor}">
+
diff --git a/src/css/icons.css b/src/css/icons.css
index 0d14f1b6f..0d50609db 100644
--- a/src/css/icons.css
+++ b/src/css/icons.css
@@ -24,6 +24,9 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-wallet:before {
+ content: "\e903";
+}
.icon-activity:before {
content: "\e900";
}
@@ -179,7 +182,7 @@
.icon-trash:before {
content: "\e626";
}
-.icon-wallet:before {
+.icon-wallet2:before {
content: "\e622";
}
.icon-history:before {
diff --git a/src/css/main.css b/src/css/main.css
index f4a4cd503..7a60c3093 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -991,6 +991,16 @@ a.button.postfix {
padding: 0;
}
+.icon-wallet {
+ vertical-align: top;
+ display: block;
+ margin-top: 7px;
+}
+
+.walletHome .icon-wallet {
+ display: inline;
+}
+
.icon-input {
font-size: 9px;
color: #fff;
@@ -1043,6 +1053,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-spacing {letter-spacing:2px;}
.text-capitalize {text-transform: capitalize;}
+.payment-uri .panel {
+ line-height: 1.4;
+}
+
.panel {
background: #FFFFFF;
border-radius: 3px;
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 5954c7804..fb3f66b75 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -174,11 +174,11 @@ _:-ms-fullscreen, :root .main {
.menu-activity {
background-image: linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%);
- box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.30);
+ box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.35);
width: 100%;
height: 8rem;
position: absolute;
- top: -15px;
+ top: -10px;
margin-left: auto;
margin-right: auto;
left:0;
@@ -360,7 +360,6 @@ a.missing-copayers {
width: 35px;
height: 35px;
border-radius: 3px;
- padding: 2px;
}
.sidebar header {
@@ -406,11 +405,6 @@ a.missing-copayers {
margin-right: 10px;
}
-.sidebar ul.off-canvas-list li a i {
- vertical-align: middle;
- opacity: 0.6;
-}
-
.sidebar .left-off-canvas-menu {
background: #E4E8EC;
line-height: 24px;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index eac1ee140..f90539b99 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -24,7 +24,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
'icon': 'icon-receive',
'link': 'receive'
}, {
- 'title': gettext('Home'),
+ 'title': gettext('Activity'),
'icon': 'icon-activity',
'link': 'walletHome'
}, {
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index 6f9946416..82d659132 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
'#DD4B39',
'#F38F12',
'#FAA77F',
- '#FADA58',
+ '#D0B136',
'#9EDD72',
'#77DADA',
'#4A90E2',