From 1af6204cc105ddbe3af38c54a1ff05f52ec697f6 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 4 Dec 2015 15:43:17 -0300 Subject: [PATCH 1/5] fix name --- src/css/mobile.css | 4 ++-- src/js/controllers/index.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/css/mobile.css b/src/css/mobile.css index 5954c7804..f35cf2e38 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -174,11 +174,11 @@ _:-ms-fullscreen, :root .main { .menu-activity { background-image: linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%); - box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.30); + box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.35); width: 100%; height: 8rem; position: absolute; - top: -15px; + top: -10px; margin-left: auto; margin-right: auto; left:0; diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index eac1ee140..f90539b99 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -24,7 +24,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r 'icon': 'icon-receive', 'link': 'receive' }, { - 'title': gettext('Home'), + 'title': gettext('Activity'), 'icon': 'icon-activity', 'link': 'walletHome' }, { From f69cea05c66a0d1c739ee73898114076943daf7f Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 4 Dec 2015 15:44:18 -0300 Subject: [PATCH 2/5] fix notifications --- public/views/includes/menu-item.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html index 4c2fd39bd..c3abc8c45 100644 --- a/public/views/includes/menu-item.html +++ b/public/views/includes/menu-item.html @@ -3,7 +3,7 @@
{{ item.title|translate }} - + {{ index.pendingTxProposalsCountForUs }} From d4a2e7f00acc4af88b56da140e47c7a95a7660a0 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 4 Dec 2015 15:49:51 -0300 Subject: [PATCH 3/5] add color --- src/js/controllers/preferencesColor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 6f9946416..82d659132 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController', '#DD4B39', '#F38F12', '#FAA77F', - '#FADA58', + '#D0B136', '#9EDD72', '#77DADA', '#4A90E2', From ce7214526eb81dc4a15e295324017fb7a4e5f5cd Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 4 Dec 2015 16:34:09 -0300 Subject: [PATCH 4/5] add icon --- public/font/icomoon.eot | Bin 13060 -> 13212 bytes public/font/icomoon.svg | 3 ++- public/font/icomoon.ttf | Bin 12896 -> 13048 bytes public/font/icomoon.woff | Bin 12972 -> 13124 bytes public/img/icon-wallet.svg | 21 +++++++++++++++++++++ src/css/icons.css | 5 ++++- 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 public/img/icon-wallet.svg diff --git a/public/font/icomoon.eot b/public/font/icomoon.eot index 6b13799c9d77b843c617709c476de7bda629d015..ce39da8c1981319fab4340d72a11a0b048659c11 100755 GIT binary patch delta 489 zcmZoko0HBu$C!cP$3#|h7S=b{CQo!I7j$D_VAuo13CX#M1^=XW9G!SVrd~E~2R{P? zV+R9+ZcIjMVhSf)raJ?J-V>lYvkagB$81(%1_pf@AYUaTx1_@Tp38I~-vOw{BPTyO zaeM8WISdR2K>ZBMauX{G7$O`P zkURr33!~)Z6h?bS=E+MK{TZ1ze_>?Rt!HIW`~R8cCi5HyHU?e>AqIH{9R>zgML|_j zAXXGqW>*wsRy1W5WmHl#H8C?b5)&0+Q#Ms%6BQ9NHZn6cQB!8Q`P-Ly7Ng|v9G2?e z0)M8mGROQ`!n{)5z(iTe)KE=aU0GUOO--Dac?oO(pJ(z+cUb>wGW{-K&Hnq)RH@o{iHO)bpfJb|kKfIg^o^n8NX0;ywd|UIRC zIKO5N1B3n-p!|~D#EJrj2u3yr27?(uzCvDNZt6@g&fh@(4xswBg8bqV24{1 - + @@ -84,4 +84,5 @@ + \ No newline at end of file diff --git a/public/font/icomoon.ttf b/public/font/icomoon.ttf index 73eb399a5d56c430f49732ac939c78c0c74f6cd9..b69dd44c3192f3f06c9785870ae930afbcff4c0b 100755 GIT binary patch delta 461 zcmaEm@*}mLfsuiMft#U$ftkU;KUm+0Ux>{OD6$8L6OwZi3;s#%ILg4lCdq~}zo$;R#A2l6`@7<6MYQWH}+*)rW381$Y1<;^mH0vxkhg&7$1LHboP za!V@Q@3~9|@*RMBJaY1r9TT_Lu9?HYU;s3LVOefsMFB%3BO3#Qp#hMuke8U7I@62u zH;^9y)X-LtUt9uoC=eLk0Le2jvq(-nV9&@riP4{td2;|Gt8P6jgWCVkEH|0wFt9Q3 zG6*rqGw3iduqq0wiUP5spfbCnAhV(=t0<$AnyHDIv5}al2%EC05}T-qn6Z(Wsfn60 z%gx`u%(ECJf9J4N{}%W&m6bW>&l2X9>INptN~VTt;_AxM;%aK*yv$2j`~N(XXS&1s zSCi>?0c-Z(ho(wa$|fLXQl*SNtT;1ZD1~l2->_s&xMf%D6cm8i~bTWv2{Q}kl8_-=NTMg1OT7p BXX5|> delta 321 zcmey7`XHsAfsuiMft#U$ftkU;KUm+0Ux>{aD6$8L6OwZi3;s#%IKsfdCdq~}zo*&Y*31oAr=7#2XdoG1Q{sy2Pmz?}$$HWEa*UVvH(EkEdup~FJqJSZSk&S`DU$N0tF9)+yCvr)7BDa{W&lM~K=_~3j-%;` z#UQaWKt2Z)3#8{%rUAvSFfi!GfUs=b4*rbPM4%ph1E3l+5awjdbk6_^0>wb)semxY zY*yin+>#2QSPxLY2MD|0bD5r#pA1yzX8<&iVHpT-uU#`IH?aa}v0)96uK>o8jBI&{ zxv4<0IY5nVAUxBH^LIghaS6~jAPXSsn1L*27RkvxjP{JolYJQd8JRcFVPw^tjCf{{YbOU;&n!Fq5G23=BaKlOTMMHWmiP f&HVa?j4VJcYLgudmT-x!0}6v&5VZM~!68Nf-n?$= delta 387 zcmX?-wkB1i+~3WOfsp|SjMgx4gXx6HhQ`8^9gJBfYKzo6C+8*>FfcG?0Hsnu_@C5{ zBk767Ah9z*J_i&Fq~}zo0mZH`Fz5iqbii5GfQpuY@PhMe=Hw<;04+9n0^}=z zaReh + + + +Wallet-Copy +Created with Sketch. + + + + + + + + diff --git a/src/css/icons.css b/src/css/icons.css index 0d14f1b6f..0d50609db 100644 --- a/src/css/icons.css +++ b/src/css/icons.css @@ -24,6 +24,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-wallet:before { + content: "\e903"; +} .icon-activity:before { content: "\e900"; } @@ -179,7 +182,7 @@ .icon-trash:before { content: "\e626"; } -.icon-wallet:before { +.icon-wallet2:before { content: "\e622"; } .icon-history:before { From 721bf3e9ea71ca77fe74f5e3e20f3ad949c74554 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 4 Dec 2015 16:34:23 -0300 Subject: [PATCH 5/5] put wallet icon --- public/views/includes/sidebar.html | 16 +++++++++------- public/views/modals/destination-address.html | 4 +++- public/views/modals/glidera-wallets.html | 4 +++- public/views/paymentUri.html | 4 +++- public/views/walletHome.html | 3 ++- src/css/main.css | 14 ++++++++++++++ src/css/mobile.css | 6 ------ 7 files changed, 34 insertions(+), 17 deletions(-) diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index ae187e935..282e14a8f 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -11,15 +11,17 @@ class="nav-item">
{{(item.name || item.id) | limitTo: 1}}
+ ng-style="{'background-color':item.color}"> + +
{{item.name || item.id}}
{{item.m}}-of-{{item.n}}
  • - - + +
    Add wallet
    @@ -28,8 +30,8 @@
  • - - + +
    Buy & Sell Bitcoin
    @@ -38,8 +40,8 @@
  • - - + +
    Settings
    diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html index 3564ef868..ba9d92957 100644 --- a/public/views/modals/destination-address.html +++ b/public/views/modals/destination-address.html @@ -62,7 +62,9 @@
  • {{(w.name || w.id) | limitTo: 1}}
    + ng-style="{'background-color':w.color}"> + +
    {{w.name || w.id}}
    {{w.m}} of {{w.n}} [Testnet] diff --git a/public/views/modals/glidera-wallets.html b/public/views/modals/glidera-wallets.html index 5ed61dfc6..52b4d55e3 100644 --- a/public/views/modals/glidera-wallets.html +++ b/public/views/modals/glidera-wallets.html @@ -28,7 +28,9 @@
  • {{(w.name || w.id) | limitTo: 1}}
    + ng-style="{'background-color':w.color}"> + +
    {{w.name || w.id}}
    {{w.m}} of {{w.n}} [Testnet] diff --git a/public/views/paymentUri.html b/public/views/paymentUri.html index 8edb2dc97..e0d0d337d 100644 --- a/public/views/paymentUri.html +++ b/public/views/paymentUri.html @@ -32,7 +32,9 @@
  • {{(w.name || w.id) | limitTo: 1}}
    + ng-style="{'background-color':w.color}"> + +
    {{w.name || w.id}}
    {{w.m}} of {{w.n}} [Testnet] diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d66fe78e2..bb76a19dc 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -109,7 +109,8 @@
    {{ (index.alias || index.walletName) | limitTo: 1}} + ng-style="{'background-color':index.backgroundColor}"> +
    diff --git a/src/css/main.css b/src/css/main.css index f4a4cd503..7a60c3093 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -991,6 +991,16 @@ a.button.postfix { padding: 0; } +.icon-wallet { + vertical-align: top; + display: block; + margin-top: 7px; +} + +.walletHome .icon-wallet { + display: inline; +} + .icon-input { font-size: 9px; color: #fff; @@ -1043,6 +1053,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .text-spacing {letter-spacing:2px;} .text-capitalize {text-transform: capitalize;} +.payment-uri .panel { + line-height: 1.4; +} + .panel { background: #FFFFFF; border-radius: 3px; diff --git a/src/css/mobile.css b/src/css/mobile.css index f35cf2e38..fb3f66b75 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -360,7 +360,6 @@ a.missing-copayers { width: 35px; height: 35px; border-radius: 3px; - padding: 2px; } .sidebar header { @@ -406,11 +405,6 @@ a.missing-copayers { margin-right: 10px; } -.sidebar ul.off-canvas-list li a i { - vertical-align: middle; - opacity: 0.6; -} - .sidebar .left-off-canvas-menu { background: #E4E8EC; line-height: 24px;