From 5c93f1bb6ee593a67f565fa6c244d34e701faa64 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 3 Oct 2019 13:02:45 -0700
Subject: [PATCH] Update qt launcher button style and error color

---
 launchers/qt/resources/qml/HFBase/Error.qml   | 17 ++--------
 .../qt/resources/qml/HFBase/LoginBase.qml     |  1 -
 .../qt/resources/qml/HFControls/HFButton.qml  |  3 ++
 .../resources/qml/HFControls/HFTextError.qml  |  2 +-
 .../resources/qml/HFControls/HFTextField.qml  |  2 +-
 launchers/qt/resources/qml/root.qml           | 31 -------------------
 6 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/launchers/qt/resources/qml/HFBase/Error.qml b/launchers/qt/resources/qml/HFBase/Error.qml
index 030963f64e..9c176d5349 100644
--- a/launchers/qt/resources/qml/HFBase/Error.qml
+++ b/launchers/qt/resources/qml/HFBase/Error.qml
@@ -68,13 +68,12 @@ Item {
     HFButton {
         id: button
         width: 166
-        height: 35
 
-        text: "Restart"
+        text: "RESTART"
 
         anchors {
             top: description.bottom
-            topMargin: 15
+            topMargin: 60
             horizontalCenter: description.horizontalCenter
         }
 
@@ -83,18 +82,6 @@ Item {
         }
     }
 
-
-    HFTextLogo {
-        id: hifilogo
-
-        anchors {
-            right: root.right
-            rightMargin: 17
-            bottom: root.bottom
-            bottomMargin: 17
-        }
-    }
-
     Component.onCompleted: {
         root.parent.setStateInfoState("left");
         root.parent.setBuildInfoState("right");
diff --git a/launchers/qt/resources/qml/HFBase/LoginBase.qml b/launchers/qt/resources/qml/HFBase/LoginBase.qml
index 8238989eb6..fd9a52bc94 100644
--- a/launchers/qt/resources/qml/HFBase/LoginBase.qml
+++ b/launchers/qt/resources/qml/HFBase/LoginBase.qml
@@ -125,7 +125,6 @@ Item {
     HFButton {
         id: button
         width: 110
-        height: 50
 
         text: "NEXT"
 
diff --git a/launchers/qt/resources/qml/HFControls/HFButton.qml b/launchers/qt/resources/qml/HFControls/HFButton.qml
index 0c2bdb0617..ad04286114 100644
--- a/launchers/qt/resources/qml/HFControls/HFButton.qml
+++ b/launchers/qt/resources/qml/HFControls/HFButton.qml
@@ -3,6 +3,9 @@ import QtQuick.Controls 2.1
 
 Button {
     id: control
+
+    height: 50
+
     property string backgroundColor: "#00000000"
     property string borderColor: "#FFFFFF"
     property string textColor: "#FFFFFF"
diff --git a/launchers/qt/resources/qml/HFControls/HFTextError.qml b/launchers/qt/resources/qml/HFControls/HFTextError.qml
index f1862c764c..2bc7d94ecf 100644
--- a/launchers/qt/resources/qml/HFControls/HFTextError.qml
+++ b/launchers/qt/resources/qml/HFControls/HFTextError.qml
@@ -2,6 +2,6 @@ import QtQuick 2.3
 import QtQuick 2.1
 
 HFTextRegular {
-    color: "#FF9999"
+    color: "#FF0014"
 }
 
diff --git a/launchers/qt/resources/qml/HFControls/HFTextField.qml b/launchers/qt/resources/qml/HFControls/HFTextField.qml
index d758fcc2dc..361e81b951 100644
--- a/launchers/qt/resources/qml/HFControls/HFTextField.qml
+++ b/launchers/qt/resources/qml/HFControls/HFTextField.qml
@@ -6,7 +6,7 @@ TextField {
 
     font.family: "Graphik Regular"
     font.pointSize: 10.5
-    color: "#7e8c81"
+    color: text.length == 0 ? "#7e8c81" : "#000000"
 
     property bool togglePasswordField: false
     verticalAlignment: TextInput.AlignVCenter
diff --git a/launchers/qt/resources/qml/root.qml b/launchers/qt/resources/qml/root.qml
index ba39ac3cda..f26bb1ec4b 100644
--- a/launchers/qt/resources/qml/root.qml
+++ b/launchers/qt/resources/qml/root.qml
@@ -35,37 +35,6 @@ Item {
         loader.source = url;
     }
 
-    HFTextRegular {
-        id: stateInfo
-        font.pixelSize: 12
-
-        anchors.right: root.right
-        anchors.top: root.top
-
-        color: "#FFFFFF"
-        text: LauncherState.uiState.toString() + " - " + LauncherState.applicationState
-
-         states: [
-             State {
-                 name: "left"
-                 AnchorChanges {
-                     target: stateInfo
-                     anchors.left: root.left
-                     anchors.right: undefined
-                 }
-             },
-
-             State {
-                 name: "right"
-                 AnchorChanges {
-                     target: stateInfo
-                     anchors.right: root.right
-                     anchors.left: undefined
-                 }
-             }
-         ]
-    }
-
     HFTextRegular {
         id: buildInfo