Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book

# Conflicts:
#	src/sass/views/address-book.scss

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);

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';

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();
 }

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);
+          }
+        }
+      }
+    }
+  }
 }

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);
       }
     }
   }