From 59e164de02ef76d2379cb10d44afe72fa408a424 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 29 Apr 2015 12:16:28 -0300 Subject: [PATCH 1/8] 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(); }); }); From 31cdda01cc12963b50bf2f75ee0d72c6e70911a9 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 29 Apr 2015 14:03:30 -0300 Subject: [PATCH 2/8] change size to bottombar --- public/views/includes/menu.html | 5 ++--- src/css/main.css | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index 30b53cdb9..5993029e8 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,7 +1,7 @@
- - + +
{{item.title|translate}}
- diff --git a/src/css/main.css b/src/css/main.css index 96a745c7f..1994cb817 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -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 60px 0; position: relative; } From 072464f3f8390ef004e732dd61360b1bb79d9800 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 30 Apr 2015 16:05:59 -0300 Subject: [PATCH 3/8] fix splash screen --- public/views/splash/1.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/views/splash/1.html b/public/views/splash/1.html index f061b7840..0989d617d 100644 --- a/public/views/splash/1.html +++ b/public/views/splash/1.html @@ -3,7 +3,7 @@

WELCOME TO

- tour1 + tour1
@@ -16,4 +16,3 @@
- From 97fcfdf5fa74fc588199f38bc413911d2971245f Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 30 Apr 2015 16:52:27 -0300 Subject: [PATCH 4/8] fix topbar align --- public/font/icomoon.eot | Bin 8688 -> 8688 bytes public/font/icomoon.svg | 2 +- public/font/icomoon.ttf | Bin 8524 -> 8524 bytes public/font/icomoon.woff | Bin 8600 -> 8600 bytes public/views/includes/topbar.html | 4 ++-- src/css/icons.css | 28 ++++++++++++++++++++++++---- src/css/main.css | 5 +++++ 7 files changed, 32 insertions(+), 7 deletions(-) diff --git a/public/font/icomoon.eot b/public/font/icomoon.eot index c8f40b7abda0ed0babc4935890d8182419731664..d295df6f42215e7b1af88fbdccf2ee4456278055 100755 GIT binary patch delta 189 zcmez1{K0vG4NH;n3g3wiOGMZwEc?m8z*xY*AhRbUH8F)vens=dA2KX^e@jl;EWv0m z#h%6>$UKYLb#k1vSpc)LsIsZDsj;cCsIh2T^tNrPX3^1Rs@t|P)q&aDwgGwfgJgn$ zi0Re#?Lgi?i*0JAK$X#^YCvT-qqlEYHTxG46eJBq44a=we_@jGU13}l&u{aUft!T^ a1TJP6F~jJ|U*tZpFn?u8+x$YFg9!jtyg;M? delta 189 zcmez1{K0vG4U5OL$nc2{OGKD9Nc%A`FcvT{$n42TO-x~vY1W+hLxyD^o21@m2}XM< zc8324SQwZOOpcQ_3t&_hRW?;NH8wRCH5O$kdi+@5xv0ol|M6pH88G|tV<7L}%QU4l zAY%3dbN?O(sRA>B>iWQ%{=Nq(NK@MUMEVPpOnBrpk9dBYuMFHQ3?OhZZGISxp8Q4b N0}Dua^9y+nCIH)&M412p diff --git a/public/font/icomoon.svg b/public/font/icomoon.svg index 9e1960a6e..330024bef 100755 --- a/public/font/icomoon.svg +++ b/public/font/icomoon.svg @@ -49,7 +49,7 @@ - + diff --git a/public/font/icomoon.ttf b/public/font/icomoon.ttf index 9ff82726ec0284187bcbaf56ff59c4ad1f51eb88..41c42fcd760ebf8101b483139fa50c50bc4dddbf 100755 GIT binary patch delta 204 zcmX@(bjE3dg9-bDWj`4h7z-E}WcFmFCZ@2-uV`jqkkescU@*%73b21>*$(8V0Qo8z zxg`~Qe@jl;SYj{5p2i@^Jd4?N@-8W}0A^)TWm9ESV^d>MW6`weZQE4MqNB}Jw{2sp z1GBen1M=<%$pirr)2r>6jhW`gx7?=-C-X&!gz^E*$Y^rQ(Y-%iOEXq*y__4loQIWI$tr@*vjApgQDswQQ)5$OQDf1x=xy6n&7z~tRJUzossppPZ3FV|2gw8h5!0*f+kw1) z7TeTJfhwa-)qu)wMsMG)YW6Q8C`cNJ7&iAve_@jGU13}l&u{aUftv;B0tSYQ8Ai-7 Udh#5(4=l`I8PYaSkmq0m0Fs+KzW@LL delta 184 zcmbQ?Ji~cHg#^ADTuhrE2BRm>k^8^`65c#P Ho`VShA9+8( diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index 28eab34a7..3c832cc5e 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -1,7 +1,7 @@