From ae323f38010932fd16e85b6d0e644c9b7dcc21f4 Mon Sep 17 00:00:00 2001
From: Gabriel Masclef <gabrielmasclef@hotmail.com>
Date: Wed, 10 Jan 2018 14:38:31 -0300
Subject: [PATCH] Fix: scan styles and buttons

---
 app-template/bitpay/sass/overrides.scss |  1 +
 app-template/copay/sass/overrides.scss  |  1 +
 src/pages/scan/scan.html                | 12 +++++-------
 src/pages/scan/scan.scss                |  4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app-template/bitpay/sass/overrides.scss b/app-template/bitpay/sass/overrides.scss
index 1a6931a30..8de71bb56 100644
--- a/app-template/bitpay/sass/overrides.scss
+++ b/app-template/bitpay/sass/overrides.scss
@@ -14,3 +14,4 @@ $color-primary: #647ce8;
 $color-secondary: #111b49;
 $icon-border-radius: 50%;
 $toolbar-background: #1e3186;
+$toolbar-scanner: rgba(30, 49, 134, 0.8);
diff --git a/app-template/copay/sass/overrides.scss b/app-template/copay/sass/overrides.scss
index 10338186c..da2bf90a9 100644
--- a/app-template/copay/sass/overrides.scss
+++ b/app-template/copay/sass/overrides.scss
@@ -14,3 +14,4 @@ $color-primary: #1abb9b;
 $color-secondary: #31465b;
 $icon-border-radius: 3px;
 $toolbar-background: #192c3a;
+$toolbar-scanner: rgba(25, 44, 58, 0.8);
\ No newline at end of file
diff --git a/src/pages/scan/scan.html b/src/pages/scan/scan.html
index 1a06981af..2327af6c6 100644
--- a/src/pages/scan/scan.html
+++ b/src/pages/scan/scan.html
@@ -1,13 +1,11 @@
 <ion-header>
-
-  <ion-navbar>
+  <ion-navbar class="navbar-transparent">
     <ion-title>{{'Scan' | translate}}</ion-title>
   </ion-navbar>
-
 </ion-header>
 
 <ion-content class="back-transparent">
-  <div class="tab-scan-has-problems" *ngIf="currentState === scannerStates.unauthorized || currentState === scannerStates.denied || currentState === scannerStates.unavailable">
+  <div class="page-scan-has-problems" *ngIf="currentState === scannerStates.unauthorized || currentState === scannerStates.denied || currentState === scannerStates.unavailable">
     <ion-icon>
       <img src="img/tab-icons/ico-receive.svg" />
     </ion-icon>
@@ -20,8 +18,8 @@
     <button ion-button block *ngIf="currentState === scannerStates.denied && canOpenSettings" (click)="openSettings()" translate>Open Settings</button>
     <button ion-button block *ngIf="currentState === scannerStates.unavailable" (click)="attemptToReactivate()" translate>Retry Camera</button>
   </div>
-  <div class="tab-scan-loading-camera" *ngIf="currentState === scannerStates.loading"></div>
-  <div class="tab-scan-camera-ready" *ngIf="currentState === scannerStates.visible">
+  <div class="page-scan-loading-camera" *ngIf="currentState === scannerStates.loading"></div>
+  <div class="page-scan-camera-ready" *ngIf="currentState === scannerStates.visible">
     <div class="guides">
       <img class="svg qr-scan-guides" src="assets/img/bitpay-wallet-qr-scan-guides.svg">
     </div>
@@ -33,4 +31,4 @@
   <div class="not-supported-message" *ngIf="notSupportedMessage">
     {{notSupportedMessage}}
   </div>
-</ion-content>
+</ion-content>
\ No newline at end of file
diff --git a/src/pages/scan/scan.scss b/src/pages/scan/scan.scss
index 6c862ece6..bc5c25b94 100644
--- a/src/pages/scan/scan.scss
+++ b/src/pages/scan/scan.scss
@@ -8,6 +8,9 @@ html , body, .back-transparent, ion-app, .nav-decor {
 page-scan {
   color: #fff;
   background: transparent none;
+  .navbar-transparent, .toolbar-background {
+    background: $toolbar-scanner;
+  }
   .not-supported-message {
     height: 100%;
     display: flex;
@@ -23,6 +26,7 @@ page-scan {
   .page-scan-camera-ready {
     // view background is transparent to show video preview
     background: none transparent;
+    height: 100%;
     .guides {
       display: flex;
       position: absolute;