Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 10:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing labels, adding flavor text, moving links

Browse source
This commit is contained in:
Alexia Mandeville 2018-09-05 16:25:18 -07:00
parent dcf2e00bd7
commit 1e697ad45f
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,21 @@ Item {
height: 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 { ShortcutText {
id: mainTextContainer id: mainTextContainer
anchors { anchors {
@ -97,7 +112,6 @@ Item {
} }
visible: false visible: false
text: qsTr("Username or password incorrect.") text: qsTr("Username or password incorrect.")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: hifi.colors.redAccent color: hifi.colors.redAccent
@ -123,15 +137,14 @@ Item {
text: Settings.getValue("wallet/savedUsername", ""); text: Settings.getValue("wallet/savedUsername", "");
width: parent.width width: parent.width
focus: true focus: true
label: "Username or Email"
placeholderText: "Username or Email" placeholderText: "Username or Email"
activeFocusOnPress: true activeFocusOnPress: true
ShortcutText { ShortcutText {
z: 10 z: 10
anchors { anchors {
left: usernameField.left left: usernameField.right
top: usernameField.top top: usernameField.bottom
leftMargin: usernameField.textFieldLabel.contentWidth + 10 leftMargin: usernameField.textFieldLabel.contentWidth + 10
topMargin: -19 topMargin: -19
} }
@ -152,7 +165,6 @@ Item {
TextField { TextField {
id: passwordField id: passwordField
width: parent.width width: parent.width
label: "Password"
placeholderText: "Password" placeholderText: "Password"
echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
activeFocusOnPress: true activeFocusOnPress: true
@ -160,8 +172,8 @@ Item {
ShortcutText { ShortcutText {
z: 10 z: 10
anchors { anchors {
left: passwordField.left left: passwordField.right
top: passwordField.top top: passwordField.bottom
leftMargin: passwordField.textFieldLabel.contentWidth + 10 leftMargin: passwordField.textFieldLabel.contentWidth + 10
topMargin: -19 topMargin: -19
} }