From e3bd63777cd553dab2c55bdee72b6b1f70fbcdbe Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 22 Sep 2016 11:46:52 -0400 Subject: [PATCH 1/9] updated add contact view for when user has empty address book --- public/img/item-ico-contact.svg | 14 +++++++ public/views/addressbook.html | 18 +++++++-- src/sass/main.scss | 1 + src/sass/mixins/layout.scss | 15 +++++++- src/sass/views/address-book.scss | 66 ++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 public/img/item-ico-contact.svg create mode 100644 src/sass/views/address-book.scss diff --git a/public/img/item-ico-contact.svg b/public/img/item-ico-contact.svg new file mode 100644 index 000000000..4ae7623c0 --- /dev/null +++ b/public/img/item-ico-contact.svg @@ -0,0 +1,14 @@ + + + + Contact Avatar + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/public/views/addressbook.html b/public/views/addressbook.html index fea7fcf67..9262127bc 100644 --- a/public/views/addressbook.html +++ b/public/views/addressbook.html @@ -1,4 +1,4 @@ - + @@ -39,12 +39,22 @@ -
+
+ +
+ diff --git a/src/sass/main.scss b/src/sass/main.scss index f8c178211..4974b6297 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -993,6 +993,7 @@ input[type=number] { @import "views/tab-settings"; @import "views/walletDetails"; @import "views/bitpayCard"; +@import "views/address-book"; @import "views/wallet-backup-phrase"; @import 'views/onboarding/onboarding'; @import "views/includes/walletActivity"; diff --git a/src/sass/mixins/layout.scss b/src/sass/mixins/layout.scss index c55eb4932..4d1934eae 100644 --- a/src/sass/mixins/layout.scss +++ b/src/sass/mixins/layout.scss @@ -1,8 +1,19 @@ @mixin center-block($topBottom: 0) { - float:none; + float: none; margin: $topBottom auto; } -.center-block{ +@mixin absolute-center() { + position: absolute; + transform: translate(-50%, -50%); + top: 50%; + left: 50%; +} + +.center-block { @include center-block(); +} + +.absolute-center{ + @include absolute-center(); } \ No newline at end of file diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss new file mode 100644 index 000000000..730a5571a --- /dev/null +++ b/src/sass/views/address-book.scss @@ -0,0 +1,66 @@ +#view-address-book { + .scroll{ + height:100%; + } + #add-contact{ + img{ + width: 6rem; + display: inline-block; + } + a{ + text-decoration: none; + } + } + .list { + .item { + color: #444; + border-top: none; + padding-top: 1.5rem; + padding-bottom: 1.5rem; + &:before { + display: block; + position: absolute; + width: 100%; + height: 1px; + background: rgba(221, 221, 221, 0.3); + top: 0; + right: 0; + content: ''; + } + &.item-divider { + color: rgba(74, 74, 74, .8); + } + &.item-heading { + &:before { + top: 99% + } + } + &.item-icon-left{ + padding-left:80px; + } + &:nth-child(2) { + &:before { + width: 0; + } + } + .item-note { + color: rgb(58, 58, 58); + } + .big-icon-svg { + padding: 0 7px; + > .bg { + border-radius: 50%; + width: 40px; + height: 40px; + box-shadow: none; + background-repeat: no-repeat; + background-clip: padding-box; + background-size: 103%; + &.green { + background: rgb(1, 209, 162); + } + } + } + } + } +} From 7973d3a75ff4a941530533aa4a3b6a7c00d1e712 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 22 Sep 2016 12:16:51 -0400 Subject: [PATCH 2/9] updating list view styles throughout settings tab --- public/views/preferencesLanguage.html | 10 ++++++---- public/views/preferencesUnit.html | 2 +- public/views/tab-settings.html | 2 +- src/sass/views/tab-settings.scss | 15 +++++++++++---- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 53da39d3e..1fa345841 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,12 +1,14 @@ - + - {{lang.name}} - +
+ {{lang.name}} + +
All contributions to Copay's translation are welcome. Sign up at crowdin.com and join the Copay project at https://crowdin.com/project/copay. diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html index 102964d6b..b9fdcc2d0 100644 --- a/public/views/preferencesUnit.html +++ b/public/views/preferencesUnit.html @@ -1,4 +1,4 @@ - + diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index 050614edc..238572441 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -1,4 +1,4 @@ - + {{'Global Settings' | translate}} diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 79e4aed0f..2726b7f16 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -1,3 +1,10 @@ +.settings { + .item { + color: #444; + border-color: rgba(221, 221, 221, 0.3); + } +} + #tab-settings { .list { .item { @@ -15,8 +22,8 @@ right: 0; content: ''; } - &.item-divider{ - color:rgba(74, 74, 74, .8); + &.item-divider { + color: rgba(74, 74, 74, .8); } &.item-heading { &:before { @@ -28,8 +35,8 @@ width: 0; } } - .item-note{ - color:rgb(58, 58, 58); + .item-note { + color: rgb(58, 58, 58); } } } From 5948123393258ea64f10529a0140d7d79c3d9cfe Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 22 Sep 2016 12:43:35 -0400 Subject: [PATCH 3/9] improved list style on main settings and preferences views --- public/views/preferences.html | 2 +- public/views/preferencesAbout.html | 2 +- public/views/preferencesAltCurrency.html | 2 +- public/views/preferencesFee.html | 2 +- public/views/translators.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/views/preferences.html b/public/views/preferences.html index 18b7c15e0..db6f06a7c 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,4 +1,4 @@ - + diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index f16c2f83a..a35c0921e 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,4 +1,4 @@ - + diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index bf500edde..593e46a2e 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -1,4 +1,4 @@ - + diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index a0b0b98b0..2959d35de 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -1,4 +1,4 @@ - + diff --git a/public/views/translators.html b/public/views/translators.html index 5fbbdd44e..95727f667 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -1,4 +1,4 @@ - + {{'Translators' | translate}} From ee4ba85d3599ad7ee36c8e3c9b3bfe2e8ee2afa9 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 22 Sep 2016 15:06:34 -0400 Subject: [PATCH 4/9] added settings class --- public/views/preferencesAdvanced.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index e17faed43..cba1b4dc3 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -1,4 +1,4 @@ - + {{'Advanced Preferences' | translate}} From 6bfcf8e874399905531ca0d3993e0239ab737969 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Thu, 22 Sep 2016 15:36:44 -0400 Subject: [PATCH 5/9] added color names --- public/views/preferencesColor.html | 5 +++-- public/views/preferencesInformation.html | 2 +- src/js/controllers/preferencesColor.js | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index 87c54639f..b7c5324d2 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -7,8 +7,9 @@ - - █ + + █ + {{c.name}} diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 9dc8b42aa..1e222374f 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -1,4 +1,4 @@ - + {{'Wallet Information' | translate}} diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 04ccc3cdd..ebb881b77 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -17,6 +17,22 @@ angular.module('copayApp.controllers').controller('preferencesColorController', '#FF599E', '#7A8C9E', ]; + $scope.colorList = [ + {color: "#DD4B39", name: "Cinnabar"}, + {color: "#F38F12", name: "Carrot Orange"}, + {color: "#FAA77F", name: "Light Salmon"}, + {color: "#D0B136", name: "Metallic Gold"}, + {color: "#9EDD72", name: "Feijoa"}, + {color: "#29BB9C", name: "Shamrock"}, + {color: "#019477", name: "Observatory"}, + {color: "#77DADA", name: "Turquoise Blue"}, + {color: "#4A90E2", name: "Cornflower Blue"}, + {color: "#484ED3", name: "Free Speech Blue"}, + {color: "#9B59B6", name: "Deep Lilac"}, + {color: "#E856EF", name: "Free Speech Magenta"}, + {color: "#FF599E", name: "Brilliant Rose"}, + {color: "#7A8C9E", name: "Light Slate Grey"} + ]; var wallet = profileService.getWallet($stateParams.walletId); $scope.wallet = wallet; From 06fe55519eed514a4af22f70d3877ffafdf801af Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 23 Sep 2016 09:26:26 -0400 Subject: [PATCH 6/9] updated save function --- public/views/preferencesColor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index b7c5324d2..dc2b06e78 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -7,7 +7,7 @@ - + █ {{c.name}} From 8a50c9f502066beeee3b21b20444fb25e879a868 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 23 Sep 2016 09:50:45 -0400 Subject: [PATCH 7/9] removed typo --- src/js/controllers/preferencesColor.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index ebb881b77..c84c8ee29 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -1,22 +1,6 @@ 'use strict'; angular.module('copayApp.controllers').controller('preferencesColorController', function($scope, $log, $stateParams, $ionicHistory, gettextCatalog, configService, profileService) { - $scope.colorList = [ - '#DD4B39', - '#F38F12', - '#FAA77F', - '#D0B136', - '#9EDD72', - '#29BB9C', - '#019477', - '#77DADA', - '#4A90E2', - '#484ED3', - '#9B59B6', - '#E856EF', - '#FF599E', - '#7A8C9E', - ]; $scope.colorList = [ {color: "#DD4B39", name: "Cinnabar"}, {color: "#F38F12", name: "Carrot Orange"}, From 2799fcb9495ba70bf4e68becef2b1a47d29be06f Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 23 Sep 2016 09:53:15 -0400 Subject: [PATCH 8/9] removed commented code --- public/views/addressbook.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/public/views/addressbook.html b/public/views/addressbook.html index 652f90a65..ee69d6fb7 100644 --- a/public/views/addressbook.html +++ b/public/views/addressbook.html @@ -47,14 +47,5 @@
- - From 097e6f6d86775b4cd2a7eddcb0fb7c8af64fe8c0 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 23 Sep 2016 09:56:28 -0400 Subject: [PATCH 9/9] removed mistake paste --- public/views/preferencesAbout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 9b8a30c20..8bda60d32 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,4 +1,4 @@ - +