From ce65e557bc29764dd7f1addd200efbb8fc14ae0d Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Thu, 6 Dec 2018 09:04:57 -0800 Subject: [PATCH] cleaning up commented code --- interface/resources/qml/LoginDialog/CantAccessBody.qml | 1 - interface/resources/qml/LoginDialog/LinkAccountBody.qml | 1 - interface/resources/qml/LoginDialog/SignUpBody.qml | 2 -- interface/resources/qml/LoginDialog/UsernameCollisionBody.qml | 3 ++- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/LoginDialog/CantAccessBody.qml b/interface/resources/qml/LoginDialog/CantAccessBody.qml index 7a46f197b6..71e0a90536 100644 --- a/interface/resources/qml/LoginDialog/CantAccessBody.qml +++ b/interface/resources/qml/LoginDialog/CantAccessBody.qml @@ -22,7 +22,6 @@ Item { property int textFieldHeight: 31 property string fontFamily: "Raleway" property int fontSize: 15 - // property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18 property int textFontSize: 24 property bool fontBold: true diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 07b0e910f5..beebfde74a 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -26,7 +26,6 @@ Item { property int textFieldHeight: 31 property string fontFamily: "Raleway" property int fontSize: 15 - // property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18 property int textFieldFontSize: 18 property bool fontBold: true diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml index df50bb97f1..0bff4110db 100644 --- a/interface/resources/qml/LoginDialog/SignUpBody.qml +++ b/interface/resources/qml/LoginDialog/SignUpBody.qml @@ -26,7 +26,6 @@ Item { property int textFieldHeight: 31 property string fontFamily: "Raleway" property int fontSize: 15 - // property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18 property int textFieldFontSize: 18 property bool fontBold: true @@ -66,7 +65,6 @@ Item { function signup() { loginDialog.signup(emailField.text, usernameField.text, passwordField.text); - return; } function init() { diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml index 24c1afc6af..db4950ae02 100644 --- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml +++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml @@ -23,6 +23,7 @@ Item { height: root.height readonly property string fontFamily: "Raleway" readonly property int fontSize: 15 + readonly property int textFieldFontSize: 18 readonly property bool fontBold: true function create() { @@ -102,7 +103,7 @@ Item { topMargin: hifi.dimensions.contentSpacing.y } font.family: "Fira Sans" - font.pixelSize: usernameCollisionBody.fontSize + font.pixelSize: usernameCollisionBody.textFieldFontSize styleRenderType: Text.QtRendering font.bold: usernameCollisionBody.fontBold width: root.bannerWidth