From 59e164de02ef76d2379cb10d44afe72fa408a424 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 29 Apr 2015 12:16:28 -0300 Subject: [PATCH] change icon in some places --- public/font/icomoon.eot | Bin 7760 -> 8688 bytes public/font/icomoon.svg | 10 ++++++++-- public/font/icomoon.ttf | Bin 7596 -> 8524 bytes public/font/icomoon.woff | Bin 7672 -> 8600 bytes public/views/includes/topbar.html | 6 +++--- public/views/join.html | 23 +++++++++++------------ public/views/walletHome.html | 18 ++++++++---------- src/css/icons.css | 24 ++++++++++++++++++++++++ src/css/main.css | 2 +- src/js/controllers/index.js | 8 ++++---- 10 files changed, 59 insertions(+), 32 deletions(-) diff --git a/public/font/icomoon.eot b/public/font/icomoon.eot index 9b3e90aedc0203e75f0761f34812fd6260e25e01..c8f40b7abda0ed0babc4935890d8182419731664 100755 GIT binary patch delta 1266 zcmZuwU1(ED6h3EW?yXpxQj^=-^pZBYnrKrJ()`F$TLWE-e=UN#Z3TZq+fc;T&_z~fz(ZtA5Z~b5Y6aJTS>`9#+KL?yvz%Ao90TAoYG`BZ8?b7V~l=)O2RG&Fm$drbl; z04r7`*a!}A!48N4*tKvp95p`n3bH!Xc(PDwHA0Ov@ zYP8btxa!b#`uQtyAFAfk(vsW=T@%@Q`*V9wR`2=@mBPX=l7IXpCndR3de@T;L5yT? oHr(AJjcCNb8!S7lpKxqitm>(nsJd=*+D?$2%n-TtO#cPH020nCvj6}9 delta 330 zcmez1e8Gk-K#qZ7jqF4=GnS5dZ>LRkC>IQ7U|`q-#0kl{i3L)jXBsA+kf~qFKlvvE z17iULgQP=7YGMkjznuXCgVY9~IP*aGcND)g2hvy=!umR6FZ-7DMJ2 zlb=a>1$c%`Jd$5 - + - + + + + + + + \ No newline at end of file diff --git a/public/font/icomoon.ttf b/public/font/icomoon.ttf index 9141f17ae74b757d2aaefcf62c4c219bfc219938..9ff82726ec0284187bcbaf56ff59c4ad1f51eb88 100755 GIT binary patch delta 1283 zcmZuxUuaWT82`R=&b^hUO=gqZnl_|Ot|ql9xyxUX+8V4@w`na@XMJe5&^9f_*3kOU z`Cy7-6$GIM(twB$0kJYiWYnkaWKXPV=H6~=YxCL_EPAr-@R#}YR*09e&_d{ z@6Y+p@7()s+lvDkKmf473~>1Lc&`?=)$r4#c|zms!SQ6e{^W~U0CW*PI+C19ll+A6 zD9LRjXTC|X?;5%Zliu}YbT~OAyDsepaJSNWe3TRw|BCMk4-wuuI(}~Y2iX}Ue3kI4 zGiL|)CJV1`bpbT?kz#B-Ih}?!_>b^1;iie?`0y#`owtPlq$G#ZXQ$55MyYvP=N=tK z?FM$D_V6IK?~s-R@TKgmvw7Rn*yC$GJ=Y#*7oAt6yCTGY$sVZxJkxh#?pZqhZ0^LS z6mabFgW=%^myc~q0105-j0Bb705|N0IDlP=#3C`(D=Q(psyJ%fFs8;NRf&Y-?Wii- zX+{=NpBf^h(i)kQ3MPw1t#fj+Q!5s^D`SFUk)Zx}%A2CjyG^+E+%PkzWO&{5TKmT^ zNO^%l0;n)PL)$q-XW+Fm#o=a=a0iP;gG{xf6;-d#ALJo_)EA4!_jF*XN5ZvrZVcHw zkY!Y723OMzichCWMfX_5Fc@G0xhNR`|?T zMHiIYr;lybpW5-Zfpg*WsoM1YZGT_+kY5Dj0HNn$ro*H$7!!wQoW4TDIG z>_@*Zx<7*(L=ZbBA+-)0)_uI4Um3MlCUY*c`T3Fz7zaC_7b3ukDbnXR^pcd%^9vu6 zvbIoKZZ$$t49;1AXH3t0PFRJh&*jWS1ao;RkSb(!(R7}ICTOM#{c0WEcpG~BK@8v? zl}c(vH%2^RDk$#rb9FmC(k}jcVd(y%kXeiVvW3ZF@%~Vu#xA)epTZ9+KAPBTep-0C z(2JGy)J@ECJ~hSp?1UxYxaDxU=oPTwXDI8dtESxBzOwE6A1uPeKc;Sf zX-rCTz4TrGRgnox)_Usz*%=w44_jOp@f|Ic BDTe?6 delta 347 zcmX@(w8pxgfsuiMft#U$ftkU;KUm+0Ux+yvD6$8L6OwZi3#3BNG%zqQ$^iL3>50V! zKw1FE&j8XK={c2YOZg}N1oDC6k`5WEi7Bl9b_NU#QX7EsW*I;M_RlOEf&3RhzDh=J zNyRcY2^|IoX&xYdM^1jSWn$H&k~2VoBS3+;+{B6k22+MF3=A?VK)ym=Vs2`<fHvlueJnCv9w72p{%@koBb;YlGOlMWZ;ADI}!!rXf+@^KtMS&(ME&8Os> F7y)=(VWa>6 diff --git a/public/font/icomoon.woff b/public/font/icomoon.woff index 97677d38e9fb545cb9937740bb17cb34c0e6b027..b250a607d1890a7fcc511cb4aedd9c33145eba32 100755 GIT binary patch delta 1331 zcmZuxO=uHA6rMLTyA@;8YId9c#BGz+q#8*~lT@U(2CBiI+6uN>4=TYXmeN03!Ro;X zVm%0A38VoL4-v5*L{U^wr0Btmh)NN?XeA)(LBSu8Vz<88wBS!>_sg62=Kai@Z#F+0 zGR?}7wrG?9!Qsphiz!=D@0Q!gyh?KK!M@laA<&KH7JdA!@_n8^+oe2J=A+N zfwudEI84y%Rju9eSQjDM2>R3u$c~e%y3vTX>!_~~DEh|lboU)bA8iWtX95r83SaNQ zLG){?zJ!Jzf$WD1(Z1LS7Op8py~acX`Q9Jvi=(<0i*FX#Q*rt8;K1-<>}F)_R~z_K zEzk`9o9CdhT$<#BO{QK{)GnIrxp!vg&NKH?wDPocg$LNH)Y-~y$~6RrfltkqO!9}72gijHT^sM#;V zA>ksFLYS6n#dOrDUuBD;h)`96zB$=VW;~47J(QTTA+GO zB=T2IXQ7;VPLg?23MHS8OygT9y|7Os0iwv9fixUP8nzcGVlz*-Bu|DPicC`c-~(i2 zBY51QjY*g%0@*PMDN{id&0EimzHLt^3hWR0xr;L`I2?;~%2! IX37zV-}FfcG?0EK-(SSs{PLwaH{ zNNfv`&jG~(={c2YK(Rdx43Z8Yyp(_P&y3W>6b1&VKR`8RAk6A-XOICDWMGgs0rFKq znEf-$#*EyO3ZPg7kiP?jm$6Cc;P9l7kV%IN@{ddmVPWuX-I$uPsm0f~ zWm8J(##UdTB|y7@VA|Vx9r64&Um3Vr!2ApU|C|CbAoPETp-bfS8TBS#k=rqOiF}+8 aP!^
-
- + {{'Close'|translate}} diff --git a/public/views/join.html b/public/views/join.html index a682c1e9a..a2b94a2a0 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -20,7 +20,7 @@ {{join.error|translate}} - +
@@ -29,7 +29,7 @@
-
 
-
- Show - Hide + Show + Hide advanced options
-
@@ -83,4 +83,3 @@
- diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 572983e93..ad2f38d4f 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -277,13 +277,11 @@ - - - - Not valid + + Not valid - - + +
@@ -311,11 +309,11 @@
- - Not valid + + Not valid - - + +
diff --git a/src/css/icons.css b/src/css/icons.css index 892ec89d1..8a15dad1c 100644 --- a/src/css/icons.css +++ b/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"; } diff --git a/src/css/main.css b/src/css/main.css index 2608908b3..96a745c7f 100644 --- a/src/css/main.css +++ b/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 { 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(); }); });