-
- Not valid
+
+ Not valid
-
-
+
+
diff --git a/src/css/icons.css b/src/css/icons.css
index 892ec89d1..68111592b 100644
--- a/src/css/icons.css
+++ b/src/css/icons.css
@@ -24,6 +24,22 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-minus-circle:before {
+ content: "\e62c";
+}
+
+.icon-plus-circle:before {
+ content: "\e62d";
+}
+
+.icon-close-circle:before {
+ content: "\e62e";
+}
+
+.icon-checkmark-circle:before {
+ content: "\e62b";
+}
+
.icon-circle:before {
content: "\e629";
}
@@ -32,6 +48,30 @@
content: "\e627";
}
+.icon-scan:before {
+ content: "\e62a";
+}
+
+.icon-trash:before {
+ content: "\e626";
+}
+
+.icon-wallet:before {
+ content: "\e622";
+}
+
+.icon-history:before {
+ content: "\e623";
+}
+
+.icon-reference:before {
+ content: "\e621";
+}
+
+.icon-bell:before {
+ content: "\e61c";
+}
+
.icon-trash:before {
content: "\e626";
}
@@ -132,6 +172,10 @@
content: "\e628";
}
+.icon-receive2:before {
+ content: "\e62f";
+}
+
.icon-arrow-left:before {
content: "\e600";
}
diff --git a/src/css/main.css b/src/css/main.css
index 2608908b3..48e9e7a27 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -41,7 +41,7 @@ h4.title {
text-transform: uppercase;
color: #2C3E50;
font-weight: 700;
- font-size: 0.8rem;
+ font-size: 0.7rem;
}
body, html{
@@ -140,7 +140,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.main {
background-color: #fff;
- padding: 45px 0 80px 0;
+ padding: 45px 0 58px 0;
position: relative;
}
@@ -384,6 +384,7 @@ ul.manage li {
.lh140 {line-height: 140%;}
.oh {overflow:hidden;}
.vm {vertical-align: middle;}
+.vt {vertical-align: top;}
.ma { margin: 0 auto;}
.tu {text-transform: uppercase;}
@@ -412,6 +413,10 @@ ul.manage li {
font-weight: 300;
}
+.tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 {
+ line-height: 2.7rem;
+}
+
.sidebar li.nav-item.selected .name-wallet {
font-weight: 700;
}
@@ -550,7 +555,7 @@ label {
font-weight: 700;
font-size: 11px;
color: #34495E;
- margin-bottom: 2px;
+ margin-bottom: 3px;
}
button.radius, .button.radius {
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 13ec35790..66c46c51a 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -40,10 +40,10 @@ body, div, .row {
.inner-wrap {
-webkit-transition-duration: 200ms;
- transition-duration: 200ms;
+ transition-duration: 200ms;
-webkit-transition-delay: 0;
transition-delay: 0;
-}
+}
body {
overflow: hidden;
@@ -109,11 +109,15 @@ _:-ms-fullscreen, :root .main {
.left-small {
width: 4.7rem;
+ line-height: 2.95rem;
+ border-right: none;
}
.right-small {
width: 4.7rem;
text-align: right;
+ line-height: 2.7rem;
+ border-left: none;
}
.tab-bar .icon-back {
@@ -127,14 +131,16 @@ _:-ms-fullscreen, :root .main {
.tab-bar .text-back {
margin-left: 26px;
- font-size: 1rem;
+ font-size: 0.9rem;
font-weight: 400;
padding: 10px 0;
+ visibility: middle;
}
.tab-bar .text-close {
- font-size: 1rem;
+ font-size: 0.9rem;
font-weight: 400;
+ line-height: 2.95rem;
}
.bottom-bar {
@@ -229,13 +235,7 @@ ul.copayer-list img {
background-color: #213140;
}
-.left-small {
- border-right: none;
-}
-.right-small {
- border-left: none;
-}
.right-small a, .left-small a {
color: #A5B2BF;
@@ -568,39 +568,39 @@ a.pin-button:active {
.reveal-modal,
.reveal-modal .fade,
.reveal-modal .fade .out,
-.reveal-modal .fade .in,
+.reveal-modal .fade .in,
.reveal-modal.fade.full.in,
.reveal-modal.fade.full.out,
.reveal-modal.fade.full,
-input[type="color"],
-input[type="date"],
-input[type="datetime-local"],
-input[type="datetime"],
-input[type="email"],
-input[type="month"],
-input[type="number"],
-input[type="password"],
-input[type="search"],
-input[type="tel"],
-input[type="text"],
-input[type="time"],
-input[type="url"],
-input[type="week"],
+input[type="color"],
+input[type="date"],
+input[type="datetime-local"],
+input[type="datetime"],
+input[type="email"],
+input[type="month"],
+input[type="number"],
+input[type="password"],
+input[type="search"],
+input[type="tel"],
+input[type="text"],
+input[type="time"],
+input[type="url"],
+input[type="week"],
textarea,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="date"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="month"]:focus,
-input[type="week"]:focus,
-input[type="email"]:focus,
-input[type="number"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="time"]:focus,
-input[type="url"]:focus,
-input[type="color"]:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="date"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="month"]:focus,
+input[type="week"]:focus,
+input[type="email"]:focus,
+input[type="number"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="time"]:focus,
+input[type="url"]:focus,
+input[type="color"]:focus,
textarea:focus
{
opacity: 1;
@@ -692,10 +692,10 @@ textarea:focus
}
.animation-left, .animation-right {
- position: absolute;
- background: #fff;
- display: block;
- width: 100%;
+ position: absolute;
+ background: #fff;
+ display: block;
+ width: 100%;
height: 100%;
top: 0;
left: 0;
@@ -758,7 +758,7 @@ textarea:focus
width:100%;
position: absolute;
top: 46px;
- bottom: 70px;
+ bottom: 37px;
overflow: auto;
padding-bottom: 20px;
}
@@ -776,5 +776,3 @@ textarea:focus
/* removes 300ms in IE */
-ms-touch-action: manipulation; /* IE10 /
touch-action: manipulation; /* IE11+ */
-
-
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9bd8616f2..f398af13c 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
'link': 'walletHome'
}, {
'title': gettext('Receive'),
- 'icon': 'icon-receive',
+ 'icon': 'icon-receive2',
'link': 'receive'
}, {
'title': gettext('Send'),
@@ -82,7 +82,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.noFocusedWallet = false;
self.onGoingProcess = {};
- // Credentials Shortcuts
+ // Credentials Shortcuts
self.m = fc.credentials.m;
self.n = fc.credentials.n;
self.network = fc.credentials.network;
@@ -567,7 +567,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, 4000, {leading: false, trailing: true});
- // No need ot listing to Local/Resume since
+ // No need ot listing to Local/Resume since
// reconnection and Local/Online will be triggered
lodash.each(['Local/Online', 'Local/Resume'], function(eventName) {
$rootScope.$on(eventName, function(event) {
@@ -720,7 +720,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
lodash.each(['NewCopayer', 'CopayerUpdated'], function(eventName) {
$rootScope.$on(eventName, function() {
- // Re try to open wallet (will triggers)
+ // Re try to open wallet (will triggers)
self.setFocusedWallet();
});
});