Commit eae75889 authored by armin's avatar armin

Merge branch 'responsiveLoginPage' into 'master'

Responsive login page

See merge request !220
parents 67bf77bc d05342db
Pipeline #799 passed with stage
in 3 minutes and 25 seconds
......@@ -99,6 +99,14 @@ Page {
anchors.leftMargin: 35
anchors.rightMargin: 35
Image{
visible: {
if(loginPage.height>500){
return true;
}else{
return false;
}
}
anchors.leftMargin: 65
anchors.rightMargin: 65
anchors.left: parent.left
......@@ -123,14 +131,26 @@ Page {
text: "Default Server"
anchors.left: parent.left
color: Colors.white
font.pointSize: Fonts.largeFontSize
font.pointSize: {
if(loginPage.height>500){
return Fonts.largeFontSize;
}else{
return Fonts.smallFontSize
}
}
}
StyledText {
id: currentServer
text: "fairchat.net"
anchors.left: parent.left
color: Colors.white
font.pointSize: Fonts.smallFontSize
font.pointSize: {
if(loginPage.height>500){
return Fonts.largeFontSize;
}else{
return Fonts.smallFontSize
}
}
}
}
Rectangle {
......@@ -154,9 +174,16 @@ Page {
id: loginCol
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: fairkomText.top
anchors.leftMargin: 30
anchors.rightMargin: 30
spacing: 40
spacing: {
if(loginPage.height>500){
return 40;
}else{
return Fonts.smallFontSize
}
}
// width: 340
StyledText {
......@@ -183,6 +210,13 @@ Page {
return false
}
}
height: {
if(loginPage.height>500){
return 50;
}else{
return 40
}
}
model: loginMethodsModel
delegate: ItemDelegate {
......@@ -202,7 +236,13 @@ Page {
background: Rectangle {
clip:true
implicitWidth: 100
implicitHeight: 40
implicitHeight: {
if(loginPage.height>500){
return 50;
}else{
return 40
}
}
opacity: enabled ? 1 : 0.3
color: "transparent"
......@@ -318,6 +358,7 @@ Page {
}
}
Rectangle{
id: fairkomText
height: 40
width: 200
anchors.horizontalCenter: parent.horizontalCenter
......@@ -334,8 +375,13 @@ Page {
textFormat: StyledText.RichText
horizontalAlignment: Text.AlignHCenter
font.pointSize: Fonts.baseFontSize
onLinkActivated: {
font.pointSize: {
if(loginPage.height>500){
return Fonts.baseFontSize;
}else{
return Fonts.smallFontSize
}
} onLinkActivated: {
Qt.openUrlExternally(link)
}
}
......
......@@ -43,6 +43,14 @@ Item {
color: Colors.tertiary
textColor: Colors.white
font.pointSize: Fonts.baseFontSize
height: {
if(loginPage.height>500){
return 50;
}else{
return 40
}
}
onClicked: {
rocketChatController.clearWebViewCookies();
......
......@@ -35,12 +35,18 @@ Item {
}
Column{
anchors.fill: parent
spacing: 25
spacing: {
if(loginPage.height>500){
return 25;
}else{
return 10;
}
}
TextField {
id: loginUsername
width: parent.width
color: Colors.white
// font.pointSize: Fonts.largeFontSize
// font.pointSize: Fonts.largeFontSize
font.pointSize: Fonts.baseFontSize
leftPadding: 5
rightPadding: 5
......@@ -60,6 +66,13 @@ Item {
opacity: 0.5
color: Colors.white
}
height: {
if(loginPage.height>500){
return 50;
}else{
return 40;
}
}
}
TextField {
......@@ -67,7 +80,7 @@ Item {
width: parent.width
text: ""
color: Colors.white
// font.pointSize: Fonts.largeFontSize
// font.pointSize: Fonts.largeFontSize
font.pointSize: Fonts.baseFontSize
leftPadding: 5
rightPadding: 5
......@@ -88,6 +101,13 @@ Item {
opacity: 0.5
color: Colors.white
}
height: {
if(loginPage.height>500){
return 50;
}else{
return 40;
}
}
}
StyledButton {
......@@ -99,7 +119,13 @@ Item {
checkable: false
color: Colors.tertiary
textColor: Colors.white
height: {
if(loginPage.height>500){
return 50;
}else{
return 40;
}
}
states: [
State {
name: "LOGGEDIN"
......@@ -142,7 +168,7 @@ Item {
} else if (newState === 1) {
state = "CONNECTED"
} else if (newState === 2) {
state = "LOGGEDIN"
state = "LOGGEDIN"
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment