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/preferences.html b/public/views/preferences.html index 77b2d7ea1..8c5fceaf6 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,4 +1,4 @@ - + {{'Wallet Preferences'|translate}} diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 32e4f608f..6ec4a3392 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -1,4 +1,4 @@ - + {{'Advanced Preferences' | translate}} diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index 62642c6f4..0954fa8b5 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -1,4 +1,4 @@ - + {{'Alternative Currency'|translate}} diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index 87c54639f..dc2b06e78 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -7,8 +7,9 @@ - - █ + + █ + {{c.name}} diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 2a1d303f9..a07f46f66 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -1,4 +1,4 @@ - + {{'Bitcoin Network Fee Policy'|translate}} 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/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index d23aa36de..b4544870a 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,4 +1,4 @@ - + {{'Language'|translate}} @@ -7,9 +7,11 @@ - {{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. @@ -18,4 +20,4 @@
- + \ No newline at end of file diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html index 3d81c61ac..f5486f5c1 100644 --- a/public/views/preferencesUnit.html +++ b/public/views/preferencesUnit.html @@ -1,4 +1,4 @@ - + {{'Unit'|translate}} diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index 3a280f45c..475ab76d0 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -1,4 +1,4 @@ - + {{'Global Settings' | translate}} diff --git a/public/views/translators.html b/public/views/translators.html index 4e1e72d9c..6d368914d 100644 --- a/public/views/translators.html +++ b/public/views/translators.html @@ -1,4 +1,4 @@ - + {{'Translators' | translate}} diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index 04ccc3cdd..c84c8ee29 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -1,21 +1,21 @@ '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"}, + {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); diff --git a/src/sass/main.scss b/src/sass/main.scss index d8047b908..61589fabf 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/address-book"; @import 'views/onboarding/onboarding'; 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 index e47aec255..fe188c2da 100644 --- a/src/sass/views/address-book.scss +++ b/src/sass/views/address-book.scss @@ -2,4 +2,70 @@ .list{ background: #ffffff; } +} +#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); + } + } + } + } + } } \ No newline at end of file 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); } } }