From 12990d7f71a68f3fffa746c9054a7aae2d5573c6 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Fri, 8 Jun 2018 12:06:12 +0530 Subject: [PATCH 1/2] Update: Changes icon design and color scheme for default wallet colors --- src/js/services/configService.js | 4 +- src/sass/variables.scss | 4 +- www/css/main.css | 20 ++++++---- www/img/icon-wallet.svg | 63 +------------------------------- 4 files changed, 18 insertions(+), 73 deletions(-) diff --git a/src/js/services/configService.js b/src/js/services/configService.js index 1e46da03a..e8ed93d88 100644 --- a/src/js/services/configService.js +++ b/src/js/services/configService.js @@ -115,8 +115,8 @@ angular.module('copayApp.services').factory('configService', function(storageSer bitcoinAlias: 'btc', bitcoinCashAlias: 'bch', - bitcoinWalletColor: '#fab915', // Observatory - bitcoinCashWalletColor: '#26B03C', // Dollar Green + bitcoinWalletColor: '#535353', // Dark Grey + bitcoinCashWalletColor: '#eeb640', // Observatory homeSectionIsHidden: { services: false diff --git a/src/sass/variables.scss b/src/sass/variables.scss index e5bd2712d..cb21c030a 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -33,8 +33,8 @@ $v-wallet-color-map: ( 3: (color: #d0b136, name: 'Metallic Gold'), 4: (color: #9edd72, name: 'Feijoa'), 5: (color: #29bb9c, name: 'Shamrock'), - 6: (color: #26B03C, name: 'Dollar Green'), - 7: (color: #fab915, name: 'Observatory'), + 6: (color: #eeb640, name: 'Light Orange'), + 7: (color: #535353, name: 'Dark Grey'), 8: (color: #77dada, name: 'Turquoise Blue'), 9: (color: #4a90e2, name: 'Cornflower Blue'), 10: (color: #484ed3, name: 'Free Speech Blue'), diff --git a/www/css/main.css b/www/css/main.css index 4e7faac0a..46db3b975 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10726,6 +10726,12 @@ textarea.d-block { #tab-home .card .item-sub:before { width: 90%; } } +#tab-home .card-banner { + padding: 0; } + #tab-home .card-banner__img { + width: 100%; + display: block; } + #tab-home .wallet-coin-logo { vertical-align: middle; margin-right: 5px; } @@ -11305,13 +11311,13 @@ textarea.d-block { /* background-color and color defaults should be the same */ .wallet-background-color-default { - background-color: #fab915; } + background-color: #535353; } .wallet-color-default { - color: #fab915; } + color: #535353; } .cashwallet-color-default { - color: #26B03C; } + color: #eeb640; } /* generate classes for all colors */ .wallet-color-0 { @@ -11357,17 +11363,17 @@ textarea.d-block { margin-left: 2.4rem; } .wallet-color-6 { - background: #26B03C; } + background: #eeb640; } .wallet-color-6:before { - content: "Dollar Green"; + content: "Light Orange"; margin-left: 2.4rem; } .wallet-color-7 { - background: #fab915; } + background: #535353; } .wallet-color-7:before { - content: "Observatory"; + content: "Dark Grey"; margin-left: 2.4rem; } .wallet-color-8 { diff --git a/www/img/icon-wallet.svg b/www/img/icon-wallet.svg index fba9bca0b..74c7055f2 100644 --- a/www/img/icon-wallet.svg +++ b/www/img/icon-wallet.svg @@ -1,62 +1 @@ - -image/svg+xml - \ No newline at end of file +icon-wallet \ No newline at end of file From 078f5bd61d5ba429904023f744e2cf2541eaefdf Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Fri, 8 Jun 2018 12:20:37 +0530 Subject: [PATCH 2/2] Update: Changes shadow specification for wallet icons --- src/sass/icons.scss | 2 +- www/css/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sass/icons.scss b/src/sass/icons.scss index 4693025f6..7d14f8886 100644 --- a/src/sass/icons.scss +++ b/src/sass/icons.scss @@ -40,7 +40,7 @@ border-radius: $v-icon-border-radius; width: 40px; height: 40px; - box-shadow: $v-hovering-box-shadow; + box-shadow: 0px 0px 9px 0px rgba(0, 0, 0, 0.3); background-repeat:no-repeat; background-clip: padding-box; background-size: 103%; diff --git a/www/css/main.css b/www/css/main.css index 46db3b975..b4e67edac 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -10005,7 +10005,7 @@ ion-view.deflash-blue:before, ion-view#view-amount:before, ion-view#view-confirm border-radius: 3px; width: 40px; height: 40px; - box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3); + box-shadow: 0px 0px 9px 0px rgba(0, 0, 0, 0.3); background-repeat: no-repeat; background-clip: padding-box; background-size: 103%; }