From 1a86b8d172ce8ceb3b3b05df4eb671bd550025a6 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Thu, 6 Dec 2018 14:58:39 -0800 Subject: [PATCH] 50% opacity/bold shortcut text --- interface/resources/qml/LoginDialog.qml | 2 +- .../resources/qml/LoginDialog/CompleteProfileBody.qml | 8 +++++--- interface/resources/qml/LoginDialog/LinkAccountBody.qml | 7 +++++-- .../resources/qml/LoginDialog/UsernameCollisionBody.qml | 1 - interface/resources/qml/OverlayLoginDialog.qml | 2 +- interface/resources/qml/dialogs/TabletLoginDialog.qml | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml index c9cf281b64..380fcc38be 100644 --- a/interface/resources/qml/LoginDialog.qml +++ b/interface/resources/qml/LoginDialog.qml @@ -63,7 +63,7 @@ FocusScope { id: opaqueRect height: parent.height width: parent.width - opacity: 0.25 + opacity: 0.5 color: "black" } diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml index ad54edaa3f..b5fd6638c4 100644 --- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml +++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml @@ -160,12 +160,13 @@ Item { text: "Already have a High Fidelity profile? Link to an existing profile here." font.family: completeProfileBody.fontFamily - font.pixelSize: 14 + font.pixelSize: completeProfileBody.fontSize font.bold: completeProfileBody.fontBold wrapMode: Text.WordWrap lineHeight: 2 lineHeightMode: Text.ProportionalHeight horizontalAlignment: Text.AlignHCenter + linkColor: hifi.colors.blueAccent onLinkActivated: { loginDialog.isLogIn = true; @@ -196,10 +197,11 @@ Item { text: completeProfileBody.termsContainerText font.family: completeProfileBody.fontFamily - font.pixelSize: 14 + font.pixelSize: completeProfileBody.fontSize font.bold: completeProfileBody.fontBold wrapMode: Text.WordWrap - color: hifi.colors.baseGrayHighlight + color: hifi.colors.lightGray + linkColor: hifi.colors.blueAccent lineHeight: 1 lineHeightMode: Text.ProportionalHeight diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index f97954335b..fd824d15c7 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -326,6 +326,7 @@ Item { } font.family: linkAccountBody.fontFamily font.pixelSize: linkAccountBody.textFieldFontSize + font.bold: linkAccountBody.fontBold text: " Can't access your account?" @@ -409,7 +410,8 @@ Item { lineHeight: 1 color: "white" font.family: linkAccountBody.fontFamily - font.pixelSize: 18 + font.pixelSize: linkAccountBody.textFieldFontSize + font.bold: linkAccountBody.fontBold verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } @@ -418,7 +420,8 @@ Item { id: signUpShortcutText z: 10 font.family: linkAccountBody.fontFamily - font.pixelSize: 18 + font.pixelSize: linkAccountBody.textFieldFontSize + font.bold: linkAccountBody.fontBold anchors { left: signUpText.right leftMargin: hifi.dimensions.contentSpacing.x diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml index 34d82d4249..1bdb90d360 100644 --- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml +++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml @@ -105,7 +105,6 @@ Item { font.family: "Fira Sans" font.pixelSize: usernameCollisionBody.textFieldFontSize styleRenderType: Text.QtRendering - font.bold: usernameCollisionBody.fontBold width: root.bannerWidth placeholderText: "Choose your own" diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml index 6c2eb28ba0..4f76fd10c8 100644 --- a/interface/resources/qml/OverlayLoginDialog.qml +++ b/interface/resources/qml/OverlayLoginDialog.qml @@ -64,7 +64,7 @@ FocusScope { id: opaqueRect height: parent.height width: parent.width - opacity: 0.25 + opacity: 0.5 color: "black" } diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml index 5868bf4cad..3c998890ca 100644 --- a/interface/resources/qml/dialogs/TabletLoginDialog.qml +++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml @@ -120,7 +120,7 @@ FocusScope { id: opaqueRect height: parent.height width: parent.width - opacity: 0.25 + opacity: 0.5 color: "black" }