From dcf2e00bd7b38482fde9d69bf41d42ccfc72fd1f Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Wed, 5 Sep 2018 14:55:12 -0700
Subject: [PATCH 1/3] Adding placeholder text

---
 interface/resources/qml/LoginDialog/LinkAccountBody.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 4c6e5f6fce..55d157fdd8 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -124,6 +124,7 @@ Item {
             width: parent.width
             focus: true
             label: "Username or Email"
+            placeholderText: "Username or Email"
             activeFocusOnPress: true
 
             ShortcutText {
@@ -151,8 +152,8 @@ Item {
         TextField {
             id: passwordField
             width: parent.width
-
             label: "Password"
+            placeholderText: "Password"
             echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
             activeFocusOnPress: true
 

From 1e697ad45f139d281012d87d4099d90b80f32625 Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Wed, 5 Sep 2018 16:25:18 -0700
Subject: [PATCH 2/3] Removing labels, adding flavor text, moving links

---
 .../qml/LoginDialog/LinkAccountBody.qml       | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 55d157fdd8..f6ad5385c0 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -87,6 +87,21 @@ Item {
         height: 48
     }
 
+    FlavorText {
+        id: flavorTextContainer
+        anchors {
+            top: parent.top
+            margins: 0
+            topMargin: hifi.dimensions.contentSpacing.y
+        }
+
+        text: qsTr("Sign in to High Fidelity to make friends, get HFC, and buy interesting things on the Marketplace!")
+        wrapMode: Text.WordWrap
+        lineHeight: 2
+        lineHeightMode: Text.ProportionalHeight
+        horizontalAlignment: Text.AlignHCenter
+    }
+    
     ShortcutText {
         id: mainTextContainer
         anchors {
@@ -97,7 +112,6 @@ Item {
         }
 
         visible: false
-
         text: qsTr("Username or password incorrect.")
         wrapMode: Text.WordWrap
         color: hifi.colors.redAccent
@@ -123,15 +137,14 @@ Item {
             text: Settings.getValue("wallet/savedUsername", "");
             width: parent.width
             focus: true
-            label: "Username or Email"
             placeholderText: "Username or Email"
             activeFocusOnPress: true
 
             ShortcutText {
                 z: 10
                 anchors {
-                    left: usernameField.left
-                    top: usernameField.top
+                    left: usernameField.right
+                    top: usernameField.bottom
                     leftMargin: usernameField.textFieldLabel.contentWidth + 10
                     topMargin: -19
                 }
@@ -152,7 +165,6 @@ Item {
         TextField {
             id: passwordField
             width: parent.width
-            label: "Password"
             placeholderText: "Password"
             echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
             activeFocusOnPress: true
@@ -160,8 +172,8 @@ Item {
             ShortcutText {
                 z: 10
                 anchors {
-                    left: passwordField.left
-                    top: passwordField.top
+                    left: passwordField.right
+                    top: passwordField.bottom
                     leftMargin: passwordField.textFieldLabel.contentWidth + 10
                     topMargin: -19
                 }

From 901de120a694fef83871f48b5d07292da50dd88d Mon Sep 17 00:00:00 2001
From: Alexia Mandeville <alexia@HIGHFIDELITY.IO>
Date: Wed, 5 Sep 2018 17:20:49 -0700
Subject: [PATCH 3/3] Removing flavortext

---
 .../resources/qml/LoginDialog/LinkAccountBody.qml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index f6ad5385c0..423f6cc73b 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -86,21 +86,6 @@ Item {
         width: 48
         height: 48
     }
-
-    FlavorText {
-        id: flavorTextContainer
-        anchors {
-            top: parent.top
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        text: qsTr("Sign in to High Fidelity to make friends, get HFC, and buy interesting things on the Marketplace!")
-        wrapMode: Text.WordWrap
-        lineHeight: 2
-        lineHeightMode: Text.ProportionalHeight
-        horizontalAlignment: Text.AlignHCenter
-    }
     
     ShortcutText {
         id: mainTextContainer