From 8d762b380b6f8cb1ff7bfe2b46da5f662f089ddf Mon Sep 17 00:00:00 2001
From: Nick Cardin <nick@cardin.email>
Date: Wed, 31 Aug 2016 18:02:15 -0400
Subject: [PATCH] standardize buttons and bar color

---
 public/views/add.html                 |  4 ++--
 public/views/amount.html              |  6 +++---
 public/views/bitpayCard.html          |  7 +++----
 public/views/join.html                |  3 +--
 public/views/tab-create-personal.html |  2 +-
 public/views/tab-create-shared.html   |  2 +-
 public/views/tab-import-file.html     |  4 ++--
 public/views/tab-import-hardware.html |  2 +-
 public/views/tab-import-phrase.html   |  2 +-
 public/views/tab-receive.html         |  2 +-
 public/views/tab-send.html            |  2 +-
 src/sass/common.scss                  | 16 ++++++++++++++++
 12 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/public/views/add.html b/public/views/add.html
index 647e5e2b8..fdcdf2481 100644
--- a/public/views/add.html
+++ b/public/views/add.html
@@ -2,8 +2,8 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="$ionicGoBack()">
-        {{'Close' | translate}}
+      <button class="button back-button" ng-click="$ionicGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/amount.html b/public/views/amount.html
index 1e93728ee..ab8060e86 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -1,8 +1,8 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ng-click="$ionicGoBack()">
-        <i class="icon ion-chevron-left"></i> {{'Back' | translate}}
+      <button class="button back-button" ng-click="$ionicGoBack()">
+        <i class="icon ion-ios-arrow-thin-left"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html
index ecfd9bdd6..d242adbc6 100644
--- a/public/views/bitpayCard.html
+++ b/public/views/bitpayCard.html
@@ -43,7 +43,7 @@
              ng-submit="bitpayCard.authenticate()"
              novalidate>
 
-          <div class="list">
+          <div class="card list">
             <label class="item item-input item-stacked-label">
               <span class="input-label">Email</span>
               <input name="email"
@@ -63,7 +63,7 @@
             </label>
           </div>
 
-          <input class="button button-block"
+          <input class="button button-block button-positive"
                  type="submit"
                  ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
                  value="Login">
@@ -90,7 +90,7 @@
             </label>
           </div>
 
-          <input class="button button-block"
+          <input class="button button-block button-positive"
                  type="submit"
                  ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
                  value="Login">
@@ -231,4 +231,3 @@
     </div>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/join.html b/public/views/join.html
index fd191f449..8b0b488c6 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -17,7 +17,7 @@
 
     <form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
 
-      <div class="list">
+      <div class="card list">
 
         <div class="row">
           <div class="col">
@@ -133,4 +133,3 @@
     </form>
   </ion-content>
 </ion-view>
-
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html
index 721ad1243..9be346cb3 100644
--- a/public/views/tab-create-personal.html
+++ b/public/views/tab-create-personal.html
@@ -16,7 +16,7 @@
 
     <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
-      <div class="list">
+      <div class="card list">
         <label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
           <span class="input-label" translate>Wallet name</span>
           <input type="text"
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html
index 9512c5ec6..41aa6c8b6 100644
--- a/public/views/tab-create-shared.html
+++ b/public/views/tab-create-shared.html
@@ -15,7 +15,7 @@
 
   <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
 
-    <div class="list">
+    <div class="card list">
       <label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
         <span class="input-label" translate>Wallet name</span>
         <input type="text"
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html
index fee2116b2..c3f5a8c76 100644
--- a/public/views/tab-import-file.html
+++ b/public/views/tab-import-file.html
@@ -15,7 +15,7 @@
 
   <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
 
-    <div class="list">
+    <div class="list card">
 
       <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>
@@ -56,7 +56,7 @@
     </div>
 
     <button type="submit"
-            class="button round expand black"
+            class="button button-block button-positive"
             ng-disabled="importForm.$invalid || !password " translate>
       Import backup
     </button>
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html
index b99545d5d..f3f018f38 100644
--- a/public/views/tab-import-hardware.html
+++ b/public/views/tab-import-hardware.html
@@ -22,7 +22,7 @@
     </div>
 
     <div ng-show="seedOptions[0]">
-      <div class="list">
+      <div class="card list">
 
         <label class="item item-input item-select">
           <div class="input-label" translate>
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html
index 7ac9264eb..1c38bfd47 100644
--- a/public/views/tab-import-phrase.html
+++ b/public/views/tab-import-phrase.html
@@ -28,7 +28,7 @@
   </div>
 
   <form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
-    <div class="list">
+    <div class="list card">
 
       <div class="row">
         <div class="col col-90">
diff --git a/public/views/tab-receive.html b/public/views/tab-receive.html
index 6036b7127..284ba4210 100644
--- a/public/views/tab-receive.html
+++ b/public/views/tab-receive.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index b3041548c..d9251a946 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -1,5 +1,5 @@
 <ion-view>
-  <ion-nav-bar>
+  <ion-nav-bar class="bar-royal">
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 53cb79b97..38548d25a 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -25,3 +25,19 @@
     box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
   }
 }
+
+.back-button {
+  border: 0;
+  .icon:before {
+    color: #fff;
+    font-size: 30px !important;
+    font-weight: bold;
+    margin-left: 5px;
+  }
+}
+
+.button-block {
+  width: 90% !important;
+  margin-left: auto;
+  margin-right: auto;
+}