diff --git a/css/src/main.css b/css/src/main.css index f968155da..4eb9b9430 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -945,7 +945,8 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e -moz-box-shadow: none; box-shadow: none; border: none; - padding-left: 45px; + padding-left: 0.5rem; + font-size: 13px; } /* SECONDARY */ @@ -1115,14 +1116,19 @@ ul.wallet-selection.wallets { color: #fff; } -label.postfix, span.postfix { - height: 40px; +label.postfix, a.postfix { + height: 100%; border: none; - background-color: #DFE5EB; font-weight: 700; - font-size: 10px; - color: #7A8C9E; + font-size: 12px; + color: #fff; text-transform: uppercase; + background: #7A8C9E; + border-radius: 0 2px 2px 0; + position: absolute; + top: 0; + right: 0; + width: 50px; } .photo-container { @@ -1171,7 +1177,7 @@ label.postfix, span.postfix { .side-nav li.active>a:first-child:not(.button) { color: #2C3E50; - background-color: #F8F8FB; + background-color: #E8ECEF; } .side-nav li>a:first-child:not(.button), .side-nav li a:not(.button) { @@ -1216,7 +1222,7 @@ label.postfix, span.postfix { .input { position: relative;} -.input i { +.createProfile .input i, .home .input i, .import-profile .input i, .input.block i { position: absolute; top: 10px; left: 10px; @@ -1229,6 +1235,20 @@ label.postfix, span.postfix { box-shadow: 1px 0px 0px 0px #FFFFFF; } +.input label { + line-height: 0; + padding: 0; +} + +.createProfile input[type=email], +.createProfile input[type=text], +.createProfile input[type=password], +.home input[type=email], +.home input[type=password], +.import-profile input[type=password] { + padding-left: 45px; +} + .icon-input { font-size: 9px; color: #fff; diff --git a/css/src/mobile.css b/css/src/mobile.css index 94e709756..d695d2d35 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -24,7 +24,7 @@ .main { height: 92%; - margin-top: 30px; + margin-top: 45px; margin-left: 0; margin-bottom: -30px; padding: 20px 0 80px 0; diff --git a/font/icomoon.eot b/font/icomoon.eot index 19b49bb20..d55408cb7 100755 Binary files a/font/icomoon.eot and b/font/icomoon.eot differ diff --git a/font/icomoon.svg b/font/icomoon.svg index fb732957e..67bba521d 100755 --- a/font/icomoon.svg +++ b/font/icomoon.svg @@ -22,14 +22,14 @@ - + - + @@ -40,7 +40,7 @@ - + diff --git a/font/icomoon.ttf b/font/icomoon.ttf index 3e6866512..3449665d2 100755 Binary files a/font/icomoon.ttf and b/font/icomoon.ttf differ diff --git a/font/icomoon.woff b/font/icomoon.woff index 5872bef2a..4f7f94f6e 100755 Binary files a/font/icomoon.woff and b/font/icomoon.woff differ diff --git a/js/controllers/profile.js b/js/controllers/profile.js index a63647676..58828bf0d 100644 --- a/js/controllers/profile.js +++ b/js/controllers/profile.js @@ -96,7 +96,7 @@ angular.module('copayApp.controllers').controller('ProfileController', function( var modalInstance = $modal.open({ templateUrl: 'views/modals/wallet-info.html', - windowClass: 'tiny', + windowClass: 'medium', controller: ModalInstanceCtrl }); diff --git a/views/create.html b/views/create.html index 490ff6f65..67b61b85e 100644 --- a/views/create.html +++ b/views/create.html @@ -25,7 +25,6 @@
diff --git a/views/import.html b/views/import.html index 9f1bfe474..6a37a559a 100644 --- a/views/import.html +++ b/views/import.html @@ -46,7 +46,6 @@
-
diff --git a/views/join.html b/views/join.html index e92cc6762..c77a9c9d6 100644 --- a/views/join.html +++ b/views/join.html @@ -29,9 +29,8 @@
-
-   +  
  diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html index 58b5a7ca4..d283f0cbd 100644 --- a/views/modals/wallet-info.html +++ b/views/modals/wallet-info.html @@ -1,4 +1,4 @@ -
+

{{item.name || item.id }}

{{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}} @@ -22,14 +22,14 @@

-
- -
-
- @@ -170,11 +159,5 @@
- -
-
- 1 BTC = {{$root.wallet.balanceInfo.alternativeConversionRate}} {{alternativeIsoCode}} -
-