Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:17:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning up commented code

Browse source
This commit is contained in:
Wayne Chen 2018-12-06 09:04:57 -08:00
parent 11c40666e4
commit ce65e557bc
4 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/LoginDialog/CantAccessBody.qml
View file

@ -22,7 +22,6 @@ Item {
property int textFieldHeight: 31 property int textFieldHeight: 31
property string fontFamily: "Raleway" property string fontFamily: "Raleway"
property int fontSize: 15 property int fontSize: 15
// property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18
property int textFontSize: 24 property int textFontSize: 24
property bool fontBold: true property bool fontBold: true

1
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -26,7 +26,6 @@ Item {
property int textFieldHeight: 31 property int textFieldHeight: 31
property string fontFamily: "Raleway" property string fontFamily: "Raleway"
property int fontSize: 15 property int fontSize: 15
// property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18
property int textFieldFontSize: 18 property int textFieldFontSize: 18
property bool fontBold: true property bool fontBold: true

2
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -26,7 +26,6 @@ Item {
property int textFieldHeight: 31 property int textFieldHeight: 31
property string fontFamily: "Raleway" property string fontFamily: "Raleway"
property int fontSize: 15 property int fontSize: 15
// property int textFieldFontSize: !root.isTablet ? !root.isOverlay : hifi.fontSizes.textFieldInput ? hifi.fontSizes.textFieldInput : 18
property int textFieldFontSize: 18 property int textFieldFontSize: 18
property bool fontBold: true property bool fontBold: true
@ -66,7 +65,6 @@ Item {
function signup() { function signup() {
loginDialog.signup(emailField.text, usernameField.text, passwordField.text); loginDialog.signup(emailField.text, usernameField.text, passwordField.text);
return;
} }
function init() { function init() {

3
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -23,6 +23,7 @@ Item {
height: root.height height: root.height
readonly property string fontFamily: "Raleway" readonly property string fontFamily: "Raleway"
readonly property int fontSize: 15 readonly property int fontSize: 15
readonly property int textFieldFontSize: 18
readonly property bool fontBold: true readonly property bool fontBold: true
function create() { function create() {
@ -102,7 +103,7 @@ Item {
topMargin: hifi.dimensions.contentSpacing.y topMargin: hifi.dimensions.contentSpacing.y
} }
font.family: "Fira Sans" font.family: "Fira Sans"
font.pixelSize: usernameCollisionBody.fontSize font.pixelSize: usernameCollisionBody.textFieldFontSize
styleRenderType: Text.QtRendering styleRenderType: Text.QtRendering
font.bold: usernameCollisionBody.fontBold font.bold: usernameCollisionBody.fontBold
width: root.bannerWidth width: root.bannerWidth