From 753a61ed2c20c9a97e913c1e7a9e4e240489fb69 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.com>
Date: Tue, 8 Oct 2019 17:31:10 -0400
Subject: [PATCH] More iteration with Joshua

---
 .../ui/simplifiedFTUE/InitialLaunchWindow.qml | 36 ++++---------------
 .../ui/simplifiedFTUE/SecondLaunchWindow.qml  |  9 ++---
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
index f601ff1e96..21fb3ab809 100644
--- a/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
+++ b/scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
@@ -50,7 +50,7 @@ Rectangle {
             Image {
                 id: avatarImage
                 anchors.verticalCenter: parent.verticalCenter
-                height: Math.min(Math.max(parent.height - 24, 350), 898)
+                height: Math.max(parent.height - 48, 350)
                 anchors.left: parent.left
                 anchors.leftMargin: 12
                 source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" +
@@ -67,6 +67,7 @@ Rectangle {
                 anchors.bottom: qrAndInstructionsContainer.top
                 anchors.bottomMargin: 32
                 anchors.left: avatarImage.right
+                anchors.leftMargin: 48
                 anchors.right: parent.right
                 contentWidth: width
                 contentHeight: contentItem.childrenRect.height
@@ -112,10 +113,11 @@ Rectangle {
             Item {
                 id: qrAndInstructionsContainer
                 anchors.left: avatarImage.right
+                anchors.leftMargin: 48
                 anchors.right: parent.right
                 anchors.rightMargin: 16
                 anchors.bottom: parent.bottom
-                height: 190
+                height: 130
 
                 Image {
                     id: avatarAppQRCodeImage
@@ -123,7 +125,7 @@ Rectangle {
                     anchors.top: parent.top
                     anchors.bottom: parent.bottom
                     anchors.left: parent.left
-                    width: 190
+                    width: 130
                     mipmap: true
                     fillMode: Image.PreserveAspectFit
                 }
@@ -156,7 +158,7 @@ Rectangle {
             anchors.right: parent.right
             anchors.rightMargin: 32
             anchors.bottom: parent.bottom
-            height: continueLink.height + learnMoreAvatarLink.height + 48
+            height: continueLink.height + 48
         
             HifiStylesUit.RalewayBold {
                 id: continueLink
@@ -183,32 +185,6 @@ Rectangle {
                     }
                 }
             }
-        
-            HifiStylesUit.RalewayBold {
-                id: learnMoreAvatarLink
-                anchors.left: parent.left
-                anchors.leftMargin: 16
-                anchors.top: continueLink.bottom
-                anchors.topMargin: 8
-                text: "Learn more about custom avatars."
-                width: paintedWidth
-                height: paintedHeight
-                color: simplifiedUI.colors.text.lightBlue
-                opacity: learnMoreAboutAvatarsMouseArea.containsMouse ? 1.0 : 0.7
-                size: 14
-                wrapMode: Text.Wrap
-
-                MouseArea {
-                    id: learnMoreAboutAvatarsMouseArea
-                    hoverEnabled: true
-                    anchors.fill: parent
-
-                    onClicked: {
-                        Tablet.playSound(TabletEnums.ButtonClick);
-                        Qt.openUrlExternally("https://www.highfidelity.com/knowledge/avatars");
-                    }
-                }
-            }
         }
     }
 
diff --git a/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml b/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml
index 2e68da20d5..2a796465ae 100644
--- a/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml
+++ b/scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml
@@ -35,7 +35,7 @@ Rectangle {
         Image {
             id: avatarImage
             anchors.verticalCenter: parent.verticalCenter
-            height: Math.min(Math.max(parent.height - 24, 350), 898)
+            height: Math.max(parent.height - 48, 350)
             anchors.left: parent.left
             anchors.leftMargin: 12
             source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png"
@@ -49,6 +49,7 @@ Rectangle {
             anchors.bottom: parent.bottom
             anchors.bottomMargin: 32
             anchors.left: avatarImage.right
+            anchors.leftMargin: 48
             anchors.right: parent.right
 
             Flickable {
@@ -103,7 +104,7 @@ Rectangle {
                         source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
                         anchors.top: parent.top
                         anchors.left: parent.left
-                        width: 190
+                        width: 130
                         height: width
                         mipmap: true
                         fillMode: Image.PreserveAspectFit
@@ -165,8 +166,8 @@ Rectangle {
 
     Image {
         id: topLeftAccentImage
-        width: 180
-        height: 450
+        width: 130
+        height: 320
         anchors.left: parent.left
         anchors.top: parent.top
         source: "images/standOutTopLeft.png"