From abc54f2e3f7f74b5b94df5d05f1fad8ceaa2c9b3 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 7 Jul 2015 17:08:02 -0700
Subject: [PATCH] Polished fonts, colors, etc.

---
 interface/resources/qml/LoginDialog.qml  |  2 --
 interface/resources/qml/UpdateDialog.qml | 36 ++++++++++++++++++++----
 interface/src/ui/UpdateDialog.cpp        |  4 +--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 8d5267f7f8..29264fa608 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -41,8 +41,6 @@ DialogContainer {
         readonly property int closeMargin: 16
         readonly property real tan30: 0.577  // tan(30°)
         readonly property int inputSpacing: 16
-        property int maximumX: parent ? parent.width - width : 0
-        property int maximumY: parent ? parent.height - height : 0
 
         Rectangle {
             id: backgroundRectangle
diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml
index 9ddc974ddd..948d2555a3 100644
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@@ -34,6 +34,7 @@ DialogContainer {
         readonly property int buttonWidth: 100
         readonly property int buttonHeight: 30
         readonly property int noticeHeight: 15 * inputSpacing
+        readonly property string fontFamily: "Futura"
 
         signal triggerBuildDownload
         signal closeUpdateDialog
@@ -90,12 +91,22 @@ DialogContainer {
                 Text {
                     id: updateAvailable
                     text: "Update Available"
+                    font {
+                        family: updateDialog.fontFamily
+                        pixelSize: hifi.fonts.pixelSize * 1.5
+                        weight: Font.DemiBold
+                    }
+                    color: "#303030"
                 }
 
                 Text {
                     id: versionDetails
                     text: updateDialog.updateAvailableDetails
-                    font.pixelSize: 14
+                    font {
+                        family: updateDialog.fontFamily
+                        pixelSize: hifi.fonts.pixelSize * 0.6
+                        letterSpacing: -0.5
+                    }
                     color: hifi.colors.text
                     anchors {
                         top: updateAvailable.bottom
@@ -109,7 +120,7 @@ DialogContainer {
 
                 border {
                     width: 1
-                    color: "#808080"
+                    color: "#a0a0a0"
                 }
 
                 ScrollView {
@@ -125,8 +136,11 @@ DialogContainer {
                         wrapMode: Text.Wrap
                         width: parent.width - updateDialog.closeMargin
                         text: updateDialog.releaseNotes
-                        font.pixelSize: 14
-                        color: "#000000"
+                        color: hifi.colors.text
+                        font {
+                            family: updateDialog.fontFamily
+                            pixelSize: hifi.fonts.pixelSize * 0.7
+                        }
                     }
                 }
             }
@@ -142,7 +156,12 @@ DialogContainer {
 
                     Text {
                         text: "Cancel"
-                        font.weight: Font.DemiBold
+                        color: "#0c9ab4"  // Same as logo
+                        font {
+                            family: updateDialog.fontFamily
+                            pixelSize: hifi.fonts.pixelSize * 1.2
+                            weight: Font.DemiBold
+                        }
                         anchors {
                             verticalCenter: parent.verticalCenter
                             horizontalCenter: parent.horizontalCenter
@@ -164,7 +183,12 @@ DialogContainer {
 
                     Text {
                         text: "Update"
-                        font.weight: Font.DemiBold
+                        color: "#0c9ab4"  // Same as logo
+                        font {
+                            family: updateDialog.fontFamily
+                            pixelSize: hifi.fonts.pixelSize * 1.2
+                            weight: Font.DemiBold
+                        }
                         anchors {
                             verticalCenter: parent.verticalCenter
                             horizontalCenter: parent.horizontalCenter
diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp
index 839553fa06..6fa2d858fb 100644
--- a/interface/src/ui/UpdateDialog.cpp
+++ b/interface/src/ui/UpdateDialog.cpp
@@ -24,8 +24,8 @@ UpdateDialog::UpdateDialog(QQuickItem* parent) :
     int currentVersion = QCoreApplication::applicationVersion().toInt();
     int latestVersion = applicationUpdater.data()->getBuildData().lastKey();
     int versionsBehind = latestVersion - currentVersion;
-    _updateAvailableDetails = "v" + QString::number(latestVersion) + " released on " 
-        + applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"];
+    _updateAvailableDetails = "v" + QString::number(latestVersion) + " released on "
+        + QString(applicationUpdater.data()->getBuildData()[latestVersion]["releaseTime"]).replace("  ", " ");
     _updateAvailableDetails += "\nYou are " + QString::number(versionsBehind) + " version" 
         + (versionsBehind > 1 ? "s" : "") + " behind";