From f5041b09ab8e85e8148924c093297c4fad0b6262 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Thu, 13 Oct 2016 01:31:15 -0400
Subject: [PATCH] feat(design): improve design of all add flows

422
---
 src/sass/views/add.scss            | 3 +++
 www/views/add.html                 | 8 ++++----
 www/views/import.html              | 2 +-
 www/views/join.html                | 4 ++--
 www/views/tab-create-personal.html | 4 ++--
 www/views/tab-create-shared.html   | 8 ++++----
 www/views/tab-import-file.html     | 2 +-
 www/views/tab-import-hardware.html | 2 +-
 www/views/tab-import-phrase.html   | 2 +-
 9 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/sass/views/add.scss b/src/sass/views/add.scss
index 1a7f0b5fc..fbe99d457 100644
--- a/src/sass/views/add.scss
+++ b/src/sass/views/add.scss
@@ -12,6 +12,9 @@
       margin-top: 25px;
     }
   }
+  .add-type {
+    color: $dark-gray;
+  }
   .bg{
     background-color:rgb(100,124,232);
     height: 50px;
diff --git a/www/views/add.html b/www/views/add.html
index dd499e340..9c64d3594 100644
--- a/www/views/add.html
+++ b/www/views/add.html
@@ -11,7 +11,7 @@
        <i class="icon big-icon-svg">
           <img src="img/icon-wallet.svg" class="bg"/>
         </i>
-        <h2 translate>New Personal Wallet</h2>
+        <span class="add-type" translate>New Personal Wallet</h2>
         <i class="icon bp-arrow-right"></i>
       </a>
 
@@ -19,7 +19,7 @@
         <i class="icon big-icon-svg">
           <img src="img/icon-wallet.svg" class="bg"/>
         </i>
-        <h2 translate>Create Shared Wallet</h2>
+        <span class="add-type" translate>Create Shared Wallet</h2>
         <i class="icon bp-arrow-right"></i>
       </a>
 
@@ -27,7 +27,7 @@
         <i class="icon big-icon-svg">
           <img src="img/item-ico-addwallet.svg" class="bg join"/>
         </i>
-        <h2 translate>Join shared wallet</h2>
+        <span class="add-type" translate>Join shared wallet</h2>
         <i class="icon bp-arrow-right"></i>
       </a>
 
@@ -35,7 +35,7 @@
         <i class="icon big-icon-svg">
           <img src="img/item-ico-import.svg" class="bg"/>
         </i>
-        <h2 translate>Import wallet</h2>
+        <span class="add-type" translate>Import wallet</h2>
         <i class="icon bp-arrow-right"></i>
       </a>
     </ion-list>
diff --git a/www/views/import.html b/www/views/import.html
index 81c80f651..f2523af76 100644
--- a/www/views/import.html
+++ b/www/views/import.html
@@ -1,4 +1,4 @@
-<ion-view ng-controller="tabsController" ng-init="importInit()">
+<ion-view ng-controller="tabsController" ng-init="importInit()" class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Import Wallet' | translate}}</ion-nav-title>
     <ion-nav-back-button>
diff --git a/www/views/join.html b/www/views/join.html
index 62f4083b7..ce24cbf10 100644
--- a/www/views/join.html
+++ b/www/views/join.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
@@ -10,7 +10,7 @@
 
     <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
 
-      <div class="card list">
+      <div class="list settings-list settings-input-group">
 
         <label class="item item-input item-stacked-label no-border">
           <span class="input-label" translate>Your nickname</span>
diff --git a/www/views/tab-create-personal.html b/www/views/tab-create-personal.html
index ceb367bde..e094b1ce6 100644
--- a/www/views/tab-create-personal.html
+++ b/www/views/tab-create-personal.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Create Personal Wallet' | translate}}</ion-nav-title>
     <ion-nav-back-button>
@@ -7,7 +7,7 @@
 
   <ion-content ng-controller="createController" ng-init="init(1);">
     <form name="setupForm" ng-submit="create(setupForm)" novalidate>
-      <div class="card list">
+      <div class="list settings-list settings-input-group">
         <label class="item item-input item-stacked-label">
           <span class="input-label" translate>Wallet name</span>
           <input type="text"
diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html
index 44a435988..619689353 100644
--- a/www/views/tab-create-shared.html
+++ b/www/views/tab-create-shared.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view class="settings">
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Create Shared Wallet' | translate}}</ion-nav-title>
     <ion-nav-back-button>
@@ -7,7 +7,7 @@
 
   <ion-content ng-controller="createController" ng-init="init(3);">
     <form name="setupForm" ng-submit="create(setupForm)" novalidate>
-      <div class="card list">
+      <div class="list settings-list settings-input-group">
         <label class="item item-input item-stacked-label">
           <span class="input-label" translate>Wallet name</span>
           <input type="text"
@@ -19,9 +19,9 @@
         </label>
 
         <label class="item item-input item-stacked-label">
-          <span class="input-label" translate>Your nickname</span>
+          <span class="input-label" translate>Your name</span>
           <input type="text"
-            placeholder="{{'John'|translate}}"
+            placeholder="{{'Satoshi'|translate}}"
             ng-model="formData.myName"
             ng-required="formData.totalCopayers != 1"
             ng-disabled="formData.totalCopayers == 1"
diff --git a/www/views/tab-import-file.html b/www/views/tab-import-file.html
index 31d439c4f..c98ca2356 100644
--- a/www/views/tab-import-file.html
+++ b/www/views/tab-import-file.html
@@ -1,5 +1,5 @@
 <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
-  <div class="list card">
+  <div class="list settings-list settings-input-group">
     <label class="item item-input item-stacked-label no-border" ng-show="!isSafari && !isCordova">
       <div class="input-label" translate>Choose a backup file from your computer</div>
       <div>
diff --git a/www/views/tab-import-hardware.html b/www/views/tab-import-hardware.html
index d8e2e0621..e5e250d97 100644
--- a/www/views/tab-import-hardware.html
+++ b/www/views/tab-import-hardware.html
@@ -6,7 +6,7 @@
   </div>
 
   <div ng-show="seedOptions[0]">
-    <div class="card list">
+    <div class="list settings-list settings-input-group">
       <label class="item item-input item-select">
         <div class="input-label" translate>
           Wallet Type
diff --git a/www/views/tab-import-phrase.html b/www/views/tab-import-phrase.html
index e091d7ee5..848d9ee6b 100644
--- a/www/views/tab-import-phrase.html
+++ b/www/views/tab-import-phrase.html
@@ -11,7 +11,7 @@
 </div>
 
 <form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
-  <div class="list card">
+  <div class="list settings-list settings-input-group">
     <div class="row">
       <div class="col col-90">
         <label class="item item-input item-stacked-label no-border">