diff --git a/.gitignore b/.gitignore index 2ad6b035f..f9706dd09 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ package .DS_Store builds/ notes.txt +app/.DS_Store diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index 817a0eb72..000000000 Binary files a/app/.DS_Store and /dev/null differ diff --git a/app/images/camera.svg b/app/images/camera.svg new file mode 100644 index 000000000..69f14b91d --- /dev/null +++ b/app/images/camera.svg @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/app/images/copy.svg b/app/images/copy.svg new file mode 100644 index 000000000..494c823bd --- /dev/null +++ b/app/images/copy.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/app/images/download.svg b/app/images/download.svg new file mode 100644 index 000000000..137a1190e --- /dev/null +++ b/app/images/download.svg @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/app/images/help.svg b/app/images/help.svg new file mode 100644 index 000000000..1424ffee3 --- /dev/null +++ b/app/images/help.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/app/images/lock-base.png b/app/images/lock-base.png deleted file mode 100644 index 359a28dd3..000000000 Binary files a/app/images/lock-base.png and /dev/null differ diff --git a/app/images/lock-top.png b/app/images/lock-top.png deleted file mode 100644 index 0b894efda..000000000 Binary files a/app/images/lock-top.png and /dev/null differ diff --git a/app/images/lock.svg b/app/images/lock.svg new file mode 100644 index 000000000..2172d5bad --- /dev/null +++ b/app/images/lock.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/images/qr.svg b/app/images/qr.svg new file mode 100644 index 000000000..b52682bfa --- /dev/null +++ b/app/images/qr.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/images/settings.svg b/app/images/settings.svg new file mode 100644 index 000000000..fe61320a5 --- /dev/null +++ b/app/images/settings.svg @@ -0,0 +1,24 @@ + + + + + + diff --git a/app/images/switch_acc.svg b/app/images/switch_acc.svg new file mode 100644 index 000000000..67c76e7f1 --- /dev/null +++ b/app/images/switch_acc.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/gulpfile.js b/gulpfile.js index 2322be608..63eb22a2c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -46,7 +46,7 @@ gulp.task('copy:root', copyTask({ })) gulp.task('copy', gulp.parallel('copy:locales','copy:images','copy:fonts','copy:reload','copy:root')) gulp.task('copy:watch', function(){ - gulp.watch(['./app/{_locales,images}/', './app/scripts/chromereload.js', './app/*.{html,json}'], gulp.series('copy')) + gulp.watch(['./app/{_locales,images}/*', './app/scripts/chromereload.js', './app/*.{html,json}'], gulp.series('copy')) }) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 5d74e571b..0ac589dfb 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -78,7 +78,8 @@ AccountDetailScreen.prototype.render = function() { ]), // small accounts nav - h('i.fa.fa-users.fa-lg.cursor-pointer.color-orange', { + h('img.cursor-pointer.color-orange', { + src: 'images/switch_acc.svg', onClick: this.navigateToAccounts.bind(this), }), ]), @@ -118,14 +119,16 @@ AccountDetailScreen.prototype.render = function() { }, }, addressSummary(selected)), - h('i.fa.fa-clipboard.fa-md.cursor-pointer.color-orange', { + h('img.cursor-pointer.color-orange', { + src: 'images/copy.svg', onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)), style:{ marginLeft: '64px', }, }), - h('i.fa.fa-download.fa-md.cursor-pointer.color-orange', { + h('img.fa-md.cursor-pointer.color-orange', { + src: 'images/download.svg', onClick: () => this.requestAccountExport(selected), style:{ position: 'relative',