Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_wallet_created

# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss

src/sass/common.scss

@@ -25,7 +25,6 @@
     box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
   }
 }
-
 .overlay{
   position: absolute;
   top:0;
@@ -34,4 +33,27 @@
   height: 100%;
   background: rgba(0,0,0,.4);
   z-index: 4;
-}
+}
+.back-button {
+  border: 0;
+  .icon:before {
+    color: #fff;
+    font-size: 30px !important;
+    font-weight: bold;
+    margin-left: 5px;
+  }
+}
+
+.search-button {
+  .icon:before {
+    color: #fff;
+    font-size: 30px !important;
+    margin-left: 5px;
+  }
+}
+
+.button-block {
+  width: 90% !important;
+  margin-left: auto;
+  margin-right: auto;
+}

src/sass/ionic.scss

@@ -0,0 +1,9 @@
+/* Set ionic variables */
+$font-family-sans-serif: "Roboto", sans-serif;
+$font-family-light-sans-serif: "Roboto-Light", sans-serif-light;
+$royal: #1e3186;
+$base-background-color: #f5f5f5;
+
+
+
+@import "../../bower_components/ionic/scss/ionic";

src/sass/main.scss

@@ -339,20 +339,6 @@ ul.wallet-selection.wallets {
   padding-right: 10%;
 }
 
-.amount {
-  width: 100%;
-  text-align: center;
-  padding: 1.5rem 1rem 1.5rem 1rem;
-  color: #fff;
-  height: 150px;
-  margin-bottom: 25px;
-}
-
-.alternative-amount {
-  height: 25px;
-  text-align: center;
-}
-
 .wallet-info {
   position: absolute;
   top: inherit;
@@ -1003,8 +989,11 @@ input[type=number] {
   }
 }
 
+@import "ionic";
+@import "common";
 @import 'mixins/mixins';
-@import 'views/onboarding/onboarding';
-@import "views/common";
+@import "views/add";
 @import "views/tab-home";
-@import "views/includes/walletActivity";
+@import "views/walletDetails";
+@import 'views/onboarding/onboarding';
+@import "views/includes/walletActivity";

src/sass/views/add.scss

@@ -0,0 +1,13 @@
+#view-add {
+
+  .item {
+    margin-bottom: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+
+    &:first-child {
+      margin-top: 25px;
+    }
+  }
+
+}

src/sass/views/onboarding/onboard-welcome.scss

@@ -5,6 +5,7 @@
     background-size: contain;
     background-repeat-y: no-repeat;
     #shopping-24 {
+      content: url("../img/onboarding-welcome-shopping24.png");
       position: absolute;
       top: 2%;
       right: 5%;

src/sass/views/tab-home.scss

@@ -19,4 +19,8 @@
     background-repeat: no-repeat;
     background-position: -5px -6px;
   }
+
+  a.item {
+    color: #444;
+  }
 }

src/sass/views/walletDetails.scss

@@ -0,0 +1,24 @@
+#walletDetails {
+  .bar-header {
+    border: 0;
+    .title, .button {
+      color: #fff;
+    }
+    .button {
+      background-color: transparent;
+    }
+  }
+
+  .amount {
+    width: 100%;
+    text-align: center;
+    padding: 2.5rem 1rem 1.5rem 1rem;
+    color: #fff;
+    height: 150px;
+    margin-bottom: 25px;
+
+    &-alternative {
+      line-height: 48px;
+    }
+  }
+}