diff options
| -rw-r--r-- | Authentication/SignIn.ui.qml | 48 | ||||
| -rw-r--r-- | Authentication/SignUp.ui.qml | 38 |
2 files changed, 71 insertions, 15 deletions
diff --git a/Authentication/SignIn.ui.qml b/Authentication/SignIn.ui.qml index 94421b5..99b6b35 100644 --- a/Authentication/SignIn.ui.qml +++ b/Authentication/SignIn.ui.qml @@ -40,6 +40,8 @@ Flickable { font { family: Eduport.hFont .family + weight: Eduport.hFont + .weight pointSize: 21.75 + .013125 * columnLayout @@ -56,6 +58,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Eduport .leadFontSize } @@ -68,6 +72,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Bootstrap .bodyFont .pointSize @@ -95,6 +101,7 @@ Flickable { placeholderText: qsTr("E-mail") font { family: Bootstrap.bodyFont.family + weight: Bootstrap.bodyFont.weight pointSize: Eduport.formControlFontSize } Layout.fillWidth: true @@ -114,6 +121,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Bootstrap .bodyFont .pointSize @@ -142,6 +151,7 @@ Flickable { echoMode: TextInput.Password font { family: Bootstrap.bodyFont.family + weight: Bootstrap.bodyFont.weight pointSize: Eduport.formControlFontSize } Layout.fillWidth: true @@ -159,7 +169,9 @@ Flickable { text: qsTr("Your password must be 8 characters at least") font { family: Bootstrap.bodyFont - .family + .family + weight: Bootstrap.bodyFont + .weight pointSize: Eduport .formTextFontSize } @@ -171,8 +183,13 @@ Flickable { id: rememberCheckBox text: qsTr("Remember me") font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap + .bodyFont.family + weight: Bootstrap + .bodyFont.weight + pointSize: Bootstrap + .bodyFont + .pointSize } Layout.fillWidth: true contentItem: Text { @@ -187,8 +204,13 @@ Flickable { id: forgotPassword text: "<a href=\"#\">Forgot password?</a>" font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap + .bodyFont.family + weight: Bootstrap + .bodyFont.weight + pointSize: Bootstrap + .bodyFont + .pointSize } horizontalAlignment: Text.AlignRight Layout.fillWidth: true @@ -210,8 +232,12 @@ Flickable { Label { text: qsTr("Don't have an account?") font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap.bodyFont + .family + weight: Bootstrap.bodyFont + .weight + pointSize: Bootstrap.bodyFont + .pointSize } } @@ -219,8 +245,12 @@ Flickable { id: signUp text: "<a href=\"sign-up.html\">Signup here</a>" font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap.bodyFont + .family + weight: Bootstrap.bodyFont + .weight + pointSize: Bootstrap.bodyFont + .pointSize underline: false } linkColor: Qt.rgba(.0235, .416, .788, 1.0) diff --git a/Authentication/SignUp.ui.qml b/Authentication/SignUp.ui.qml index 3c29e7e..1ac51fa 100644 --- a/Authentication/SignUp.ui.qml +++ b/Authentication/SignUp.ui.qml @@ -41,6 +41,8 @@ Flickable { font { family: Eduport.hFont .family + weight: Eduport.hFont + .weight pointSize: 21.75 + .013125 * columnLayout @@ -57,6 +59,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Eduport .leadFontSize } @@ -70,6 +74,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Bootstrap .bodyFont .pointSize @@ -98,6 +104,7 @@ Flickable { placeholderText: qsTr("E-mail") font { family: Bootstrap.bodyFont.family + weight: Bootstrap.bodyFont.weight pointSize: Eduport.formControlFontSize } Layout.fillWidth: true @@ -117,6 +124,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Bootstrap .bodyFont .pointSize @@ -146,6 +155,7 @@ Flickable { echoMode: TextInput.Password font { family: Bootstrap.bodyFont.family + weight: Bootstrap.bodyFont.weight pointSize: Eduport.formControlFontSize } Layout.fillWidth: true @@ -165,6 +175,8 @@ Flickable { font { family: Bootstrap .bodyFont.family + weight: Bootstrap + .bodyFont.weight pointSize: Bootstrap .bodyFont .pointSize @@ -194,6 +206,7 @@ Flickable { echoMode: TextInput.Password font { family: Bootstrap.bodyFont.family + weight: Bootstrap.bodyFont.weight pointSize: Eduport.formControlFontSize } Layout.fillWidth: true @@ -213,8 +226,13 @@ Flickable { id: agreementCheckBox text: "By signing up, you agree to the <a href=\"#\">terms of service</a>" font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap + .bodyFont.family + weight: Bootstrap + .bodyFont.weight + pointSize: Bootstrap + .bodyFont + .pointSize } Layout.fillWidth: true contentItem: Text { @@ -241,8 +259,12 @@ Flickable { Label { text: qsTr("Already have an account?") font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap.bodyFont + .family + weight: Bootstrap.bodyFont + .weight + pointSize: Bootstrap.bodyFont + .pointSize } } @@ -250,8 +272,12 @@ Flickable { id: signIn text: "<a href=\"sign-in.html\">Sign in here</a>" font { - family: Bootstrap.bodyFont.family - pointSize: Bootstrap.bodyFont.pointSize + family: Bootstrap.bodyFont + .family + weight: Bootstrap.bodyFont + .weight + pointSize: Bootstrap.bodyFont + .pointSize underline: false } linkColor: Qt.rgba(.0235, .416, .788, 1.0) |