Default Button height, bump qtquick version (ubports#39)

rubencarneiro · Jan 20, 2020 · 9a731b0 · 9a731b0
1 parent 1f75cf8
commit 9a731b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/qml/nextcloud/Main.qml b/qml/nextcloud/Main.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import Ubuntu.OnlineAccounts.Plugin 1.0
 
 Flickable {

diff --git a/qml/nextcloud/NewAccount.qml b/qml/nextcloud/NewAccount.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 
@@ -29,7 +29,7 @@ Item {
             id: errorLabel
             anchors { left: parent.left; right: parent.right }
             font.bold: true
-            color: UbuntuColors.red
+            color: theme.palette.normal.negative
             wrapMode: Text.Wrap
             visible: !__busy && text != ""
         }
@@ -88,15 +88,13 @@ Item {
             Button {
                 id: btnCancel
                 text: i18n.dtr("account-plugins", "Cancel")
-                height: parent.height
                 width: (parent.width / 2) - 0.5 * parent.spacing
                 onClicked: finished()
             }
             Button {
                 id: btnContinue
                 text: i18n.dtr("account-plugins", "Continue")
-                color: UbuntuColors.green
-                height: parent.height
+                color: theme.palette.normal.positive
                 width: (parent.width / 2) - 0.5 * parent.spacing
                 onClicked: login()
                 enabled: !__busy

diff --git a/qml/owncloud/Main.qml b/qml/owncloud/Main.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import Ubuntu.OnlineAccounts.Plugin 1.0
 
 Flickable {

diff --git a/qml/owncloud/NewAccount.qml b/qml/owncloud/NewAccount.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import Ubuntu.Components 1.3
 import Ubuntu.OnlineAccounts 0.1
 
@@ -28,7 +28,7 @@ Item {
             id: errorLabel
             anchors { left: parent.left; right: parent.right }
             font.bold: true
-            color: UbuntuColors.red
+            color: theme.palette.normal.negative
             wrapMode: Text.Wrap
             visible: !__busy && text != ""
         }
@@ -87,15 +87,13 @@ Item {
             Button {
                 id: btnCancel
                 text: i18n.dtr("account-plugins", "Cancel")
-                height: parent.height
                 width: (parent.width / 2) - 0.5 * parent.spacing
                 onClicked: finished()
             }
             Button {
                 id: btnContinue
                 text: i18n.dtr("account-plugins", "Continue")
-                color: UbuntuColors.green
-                height: parent.height
+                color: theme.palette.normal.positive
                 width: (parent.width / 2) - 0.5 * parent.spacing
                 onClicked: login()
                 enabled: !__busy