change icon in some places

public/font/icomoon.svg

@@ -46,7 +46,13 @@
 <glyph unicode="&#xe624;" d="M449.248 577.472v318.528l-449.248-448 449.248-448v321.344c228.32 0 453.664-39.744 574.752-228.352-12.608 343.712-269.76 425.536-574.752 484.48z" />
 <glyph unicode="&#xe625;" d="M680.75 729.25h-337.5l-281.25-337.5v-225.001c0-31.066 25.184-56.25 56.25-56.25h787.5c31.068 0 56.25 25.184 56.25 56.25v225.001l-281.25 337.5zM737.001 391.75l-112.5-112.5h-225.001l-112.5 112.5h-151.778l234.374 281.25h284.807l234.374-281.25h-151.778z" />
 <glyph unicode="&#xe626;" d="M362.451 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.614q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.614q7.572 0 12.44 4.868t4.868 12.44zM500.913 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM639.374 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM345.143 724.923h242.307l-25.962 63.281q-3.787 4.868-9.194 5.95h-171.455q-5.408-1.082-9.194-5.95zM847.067 707.615v-34.615q0-7.572-4.868-12.44t-12.44-4.868h-51.923v-512.739q0-44.892-25.42-77.615t-61.117-32.722h-450q-35.697 0-61.117 31.641t-25.42 76.533v514.904h-51.923q-7.572 0-12.44 4.868t-4.868 12.44v34.615q0 7.572 4.868 12.44t12.44 4.868h167.126l37.861 90.325q8.112 20.012 29.207 34.074t42.728 14.063h173.077q21.635 0 42.728-14.063t29.207-34.074l37.861-90.325h167.126q7.572 0 12.44-4.868t4.868-12.44z" horiz-adv-x="933" />
-<glyph unicode="&#xe627;" d="M1024 463.238c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
+<glyph unicode="&#xe627;" d="M1024 448c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
 <glyph unicode="&#xe628;" d="M921.6 819.2h-489.165c-22.528 0-54.835-12.134-71.782-26.982l-347.955-304.435c-16.947-14.848-16.947-39.117 0-53.965l347.955-304.486c16.947-14.797 49.254-26.931 71.782-26.931h489.165c56.371 0 102.4 46.080 102.4 102.4v512c0 56.32-46.029 102.4-102.4 102.4zM777.779 256l-130.918 130.918-130.816-130.918-73.933 73.882 130.867 130.918-130.867 130.867 73.933 73.933 130.867-130.867 130.867 130.867 73.882-73.933-130.816-130.867 130.867-130.867-73.933-73.933z" />
-<glyph unicode="&#xe629;" d="M536.381-73.143c-297.448 0-536.381 238.933-536.381 536.381s238.933 536.381 536.381 536.381 536.381-238.933 536.381-536.381c0-297.448-238.933-536.381-536.381-536.381zM536.381 950.857c-268.19 0-487.619-219.429-487.619-487.619s219.429-487.619 487.619-487.619c268.19 0 487.619 219.429 487.619 487.619s-219.429 487.619-487.619 487.619z" horiz-adv-x="1073" />
+<glyph unicode="&#xe629;" d="M536.381-88.381c-297.448 0-536.381 238.933-536.381 536.381s238.933 536.381 536.381 536.381 536.381-238.933 536.381-536.381c0-297.448-238.933-536.381-536.381-536.381zM536.381 935.619c-268.19 0-487.619-219.429-487.619-487.619s219.429-487.619 487.619-487.619c268.19 0 487.619 219.429 487.619 487.619s-219.429 487.619-487.619 487.619z" horiz-adv-x="1073" />
+<glyph unicode="&#xe62a;" d="M0 846.222v-227.556h113.778v227.556h227.556v113.778h-227.556c-62.578 0-113.778-51.2-113.778-113.778v0zM113.778 277.333h-113.778v-227.556c0-62.578 51.2-113.778 113.778-113.778h227.556v113.778h-227.556v227.556zM910.222 49.778h-227.556v-113.778h227.556c62.578 0 113.778 51.2 113.778 113.778v227.556h-113.778v-227.556zM910.222 960h-227.556v-113.778h227.556v-227.556h113.778v227.556c0 62.578-51.2 113.778-113.778 113.778v0zM631.467 430.933h-102.4v-102.4h-34.133v102.4h-102.4v34.133h102.4v102.4h34.133v-102.4h102.4v-34.133z" />
+<glyph unicode="&#xe62b;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448c247.4 0 448 200.6 448 448s-200.6 448-448 448zM741.8 597.8l-278.2-357c-2.2-2.2-5.8-7-10.2-7-4.6 0-7.6 3.2-10.2 5.8s-157.8 151.8-157.8 151.8l-3 3c-1.2 1.8-2.2 4-2.2 6.4s1 4.6 2.2 6.4c0.8 0.8 1.4 1.4 2.2 2.4 15.4 16.2 46.6 49 48.6 51 2.6 2.6 4.8 6 9.6 6 5 0 8.2-4.2 10.6-6.6s90-86.6 90-86.6l222.6 286c2 1.6 4.4 2.8 7 2.8s5-1 7-2.6l61.2-48.2c1.6-2 2.6-4.4 2.6-7 0.2-2.6-0.8-4.8-2-6.6z" />
+<glyph unicode="&#xe62c;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448 448 200.6 448 448-200.6 448-448 448zM768 416h-512v64h512v-64z" />
+<glyph unicode="&#xe62d;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448 448 200.6 448 448-200.6 448-448 448zM768 416h-224v-224h-64v224h-224v64h224v224h64v-224h224v-64z" />
+<glyph unicode="&#xe62e;" d="M512 894c-247.4 0-448-200.6-448-448s200.6-448 448-448c247.4 0 448 200.6 448 448s-200.6 448-448 448zM728.6 295c3-3 4.6-7 4.6-11.2s-1.6-8.4-4.6-11.2l-43.2-43.4c-3.2-3.2-7.2-4.6-11.2-4.6s-8.2 1.6-11.2 4.6l-151 151.2-150.8-151.4c-3-3.2-7.2-4.6-11.2-4.6s-8.2 1.6-11.2 4.6l-43.2 43.4c-3 3-4.6 7-4.6 11.2s1.6 8.4 4.6 11.2l151.4 152-151.8 150c-6.2 6.2-6.2 16.4 0 22.6l43.2 43.4c3 3 7 4.6 11.2 4.6s8.2-1.6 11.2-4.6l151.4-149.4 151.4 149.4c3 3 7 4.6 11.2 4.6s8.2-1.6 11.2-4.6l43.2-43.4c6.2-6.2 6.2-16.4 0-22.6l-151.8-150 151.2-151.8z" />
+<glyph unicode="&#xe62f;" d="M990.208 279.347l-163.021 109.67h-100.506l174.080-133.53h-181.504c-5.222 0-9.882-2.662-12.288-6.81l-41.779-114.432h-306.381l-41.83 114.432c-2.304 4.147-7.066 6.81-12.288 6.81h-181.453l174.131 133.53h-100.557l-162.97-109.67c-24.269-14.49-38.758-47.923-32.256-74.189l28.723-157.389c6.502-26.317 35.379-47.872 64.051-47.872h835.226c28.774 0 57.6 21.555 64.102 47.872l28.723 157.389c6.605 26.317-7.936 59.699-32.205 74.189zM778.291 608.154h-169.011v262.144h-194.56v-262.144h-168.96l266.24-249.856 266.291 249.856z" />
 </font></defs></svg>

public/views/includes/topbar.html

@@ -1,6 +1,6 @@
 <nav ng-controller="topbarController as topbar" class="tab-bar">
   <section class="left-small">
-    <a id="hamburger" class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet" 
+    <a id="hamburger" class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome  && !index.noFocusedWallet"
       ng-click="index.openMenu()"><i class="fi-list size-24"></i>
     </a>
     <a ng-show="goBackToState" class="ng-animate-disabled"
@@ -10,8 +10,8 @@
   </section>
 
   <section class="right-small" ng-show="!goBackToState">
-    <a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10" 
-      ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
+    <a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
+      ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
     <a ng-show="closeToHome" class="p10 ng-animate-disabled"
       ng-click="topbar.goHome(); closeToHome = null">
       <span class="text-close">{{'Close'|translate}}</span>

public/views/join.html

@@ -20,7 +20,7 @@
           {{join.error|translate}}
         </span>
       </div>
-  
+
       <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
           <label><span translate>Your nickname</span>
             <div class="input">
@@ -29,7 +29,7 @@
           </label>
 
           <div class="row collapse">
-            <label for="secret" class="left"><span translate>Wallet Invitation</span> 
+            <label for="secret" class="left"><span translate>Wallet Invitation</span>
               <small translate ng-show="joinForm.secret.$pristine">Required</small>
             </label>
             <span class="has-error right size-12" ng-show="joinForm.secret.$invalid
@@ -44,34 +44,34 @@
           <div class="input">
             <input id="secret" type="text" placeholder="{{'Paste invitation here'|translate}}" name="secret" ng-model="secret" wallet-secret required>
             <div ng-hide="showScanner || disableScanner">
-              <a class="postfix" ng-click="join.openScanner()"><i class="fi-camera size-24">&nbsp;</i></a>
+              <a class="postfix text-right" ng-click="join.openScanner()"><i class="icon-scan size-18">&nbsp;</i></a>
             </div>
             <div ng-show="showScanner">
               <a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
             </div>
           </div>
 
-          <div id="scanner" 
-            class="row" 
+          <div id="scanner"
+            class="row"
             ng-if="showScanner"
             ng-include="'views/includes/scanner.html'">
           </div>
 
           <a class="button outline light-gray tiny expand" ng-click="join.hideAdv=!join.hideAdv">
             <i class="fi-widget m3r"></i>
-            <span translate ng-show="!join.hideAdv">Show</span> 
-            <span translate ng-show="join.hideAdv">Hide</span> 
+            <span translate ng-show="!join.hideAdv">Show</span>
+            <span translate ng-show="join.hideAdv">Hide</span>
             <span translate>advanced options</span>
             <i ng-show="!join.hideAdv" class="icon-arrow-down4"></i>
             <i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
           </a>
           <div ng-show="join.hideAdv" class="row">
             <div class="large-12 columns">
-              <label for="ext-master">Master extended private key 
+              <label for="ext-master">Master extended private key
               <small translate>If not given, a secure key will be generated</small>
-                <input id="ext-master" 
-                type="text" 
-                placeholder="BIP32 master extended private key" 
+                <input id="ext-master"
+                type="text"
+                placeholder="BIP32 master extended private key"
                 name="privateKey" ng-model="privateKey">
               </label>
             </div>
@@ -83,4 +83,3 @@
 </div>
 
 <div class="extra-margin-bottom"></div>
-

public/views/walletHome.html

@@ -277,13 +277,11 @@
 
               <span ng-hide="sendForm.address.$pristine">
                 <span class="has-error right size-12" ng-show="sendForm.address.$invalid && _address">
-                  <span class="icon-input">
-                    <i class="fi-x"></i>
-                  </span>
-                  <span translate>Not valid</span>
+                  <i class="icon-close-circle size-14"></i>
+                  <span class="vm" translate>Not valid</span>
                 </span>
-                <small class="icon-input right" ng-show="!sendForm.address.$invalid">
-                  <i class="fi-check"></i>
+                <small class="right text-primary" ng-show="!sendForm.address.$invalid">
+                  <i class="icon-checkmark-circle size-14"></i>
                 </small>
               </span>
             </div>
@@ -311,11 +309,11 @@
             <div class="large-12 medium-12 columns">
               <div class="right" ng-hide="sendForm.amount.$pristine && !sendForm.amount.$modelValue ">
                 <span class="has-error right size-12" ng-if="sendForm.amount.$invalid">
-                  <span class="icon-input"><i class="fi-x"></i></span>
-                  <span translate>Not valid</span>
+                  <i class="icon-close-circle size-14"></i>
+                  <span clas="vm" translate>Not valid</span>
                 </span>
-                <small class="icon-input right" ng-if="!sendForm.amount.$invalid">
-                    <i class="fi-check"></i>
+                <small class="text-primary right" ng-if="!sendForm.amount.$invalid">
+                  <i class="icon-checkmark-circle size-14"></i>
                 </small>
               </div>
               <div ng-if="!home.canShowAlternative()">

src/css/icons.css

@@ -24,6 +24,26 @@
 	-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-scan:before {
+	content: "\e62a";
+}
+
 .icon-circle:before {
 	content: "\e629";
 }
@@ -132,6 +152,10 @@
 	content: "\e628";
 }
 
+.icon-receive2:before {
+	content: "\e62f";
+}
+
 .icon-arrow-left:before {
 	content: "\e600";
 }

src/css/main.css

@@ -550,7 +550,7 @@ label {
   font-weight: 700;
   font-size: 11px;
   color: #34495E;
-  margin-bottom: 2px;
+  margin-bottom: 3px;
 }
 
 button.radius, .button.radius {

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();
     });
   });