Made the account wizard look more integrated

3 files changed, 10 insertions, 9 deletions

diff --git a/components/accounts/contents/ui/AccountWizard.qml b/components/accounts/contents/ui/AccountWizard.qml
index b4720174..56c975e5 100644
--- a/components/accounts/contents/ui/AccountWizard.qml
+++ b/components/accounts/contents/ui/AccountWizard.qml
@@ -24,7 +24,6 @@ import org.kube.framework 1.0 as Kube
 Kube.Popup {
     id: root
 
-
     property bool requireSetup: false
     property var availableAccountPlugins: []
 
diff --git a/components/kube/contents/ui/AccountsView.qml b/components/kube/contents/ui/AccountsView.qml
index 5b19d3fd..0547ccac 100644
--- a/components/kube/contents/ui/AccountsView.qml
+++ b/components/kube/contents/ui/AccountsView.qml
@@ -19,7 +19,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.3 as Controls
-import QtQuick.Controls 2.0 as Controls2
+import QtQuick.Controls 2.0
 import org.kube.framework 1.0 as Kube
 import org.kube.components.accounts 1.0 as KubeAccounts
 
@@ -125,13 +125,13 @@ Rectangle {
     KubeAccounts.AccountWizard {
         id: accountWizard
 
-        availableAccountPlugins: root.availableAccountPlugins
-
-        height: app.height * 0.85
-        width: app.width * 0.85
+        parent: ApplicationWindow.overlay
+        height: app.height
+        width: app.width - app.sidebarWidth
+        x: app.sidebarWidth
+        y: 0
 
-        x: app.width * 0.075
-        y: app.height * 0.075
+        availableAccountPlugins: root.availableAccountPlugins
     }
     //END AccountWizard
 }
diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 224b317e..d94449ba 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -27,6 +27,8 @@ import org.kube.framework 1.0 as Kube
 Controls2.ApplicationWindow {
     id: app
 
+    property int sidebarWidth: Kube.Units.gridUnit + Kube.Units.largeSpacing
+
     height: Screen.desktopAvailableHeight * 0.8
     width: Screen.desktopAvailableWidth * 0.8
     visible: true
@@ -140,7 +142,7 @@ Controls2.ApplicationWindow {
                 top: mainContent.top
                 bottom: mainContent.bottom
             }
-            width: Kube.Units.gridUnit + Kube.Units.largeSpacing
+            width: app.sidebarWidth
             color: Kube.Colors.textColor
 
             Rectangle {