invert toolbar icons and move it to the bottom. adjust accout swithcer accordingly

3 files changed, 53 insertions, 51 deletions

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index 7cabf9a9..2b3c78b0 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -152,61 +152,18 @@ Controls2.ApplicationWindow {
         height: app.height
         width: app.width
 
-        Rectangle {
+         Rectangle {
             width: Kube.Units.gridUnit * 10
             Layout.maximumWidth: app.width * 0.25
             Layout.minimumWidth: Kube.Units.gridUnit * 5
 
             color: Kube.Colors.textColor
 
-            Controls2.ToolBar {
-                id: toolBar
-
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-
-                RowLayout {
-                    anchors.centerIn: parent
-
-                    spacing: Kube.Units.largeSpacing
-
-                    Kube.AccountSwitcher {
-                        id: accountSwitcher
-                        iconName: Kube.Icons.menu
-                        height: Kube.Units.gridUnit * 1.5
-                        width: height
-                    }
-
-                    ToolButton {
-                        iconName: Kube.Icons.user
-                        height: Kube.Units.gridUnit * 1.5
-                        width: height
-
-                        onClicked: {
-                            people.open()
-                        }
-                    }
-
-                    ToolButton {
-                        iconName: Kube.Icons.search
-                        height: Kube.Units.gridUnit * 1.5
-                        width: height
-
-                        onClicked: {
-                            search.open()
-                        }
-                    }
-                }
-            }
-
             Kube.PositiveButton {
                 id: newMailButton
 
                 anchors {
-                    top: toolBar.bottom
+                    top: parent.top
                     left: parent.left
                     right: parent.right
                     margins: Kube.Units.largeSpacing
@@ -346,12 +303,58 @@ Controls2.ApplicationWindow {
                 id: outbox
 
                 anchors {
-                    bottom: parent.bottom
+                    bottom: toolBar.top
                     left: parent.left
                     right: parent.right
                 }
                 height: Kube.Units.gridUnit * 1.5
             }
+
+
+            Item {
+                id: toolBar
+
+                anchors {
+                    bottom: parent.bottom
+                    left: parent.left
+                    right: parent.right
+                }
+                height: Kube.Units.gridUnit * 2
+
+                RowLayout {
+                    anchors.centerIn: parent
+
+                    spacing: Kube.Units.largeSpacing
+
+                    Kube.AccountSwitcher {
+                        id: accountSwitcher
+                        iconName: Kube.Icons.menu_inverted
+                        height: Kube.Units.gridUnit * 1.5
+                        width: height
+                    }
+
+                    ToolButton {
+                        iconName: Kube.Icons.user_inverted
+                        height: Kube.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            people.open()
+                        }
+                    }
+
+                    ToolButton {
+                        iconName: Kube.Icons.search_inverted
+                        height: Kube.Units.gridUnit * 1.5
+                        width: height
+
+                        onClicked: {
+                            search.open()
+                        }
+                    }
+                }
+            }
+
         }
 
         Kube.MailListView  {
diff --git a/framework/qml/AccountSwitcher.qml b/framework/qml/AccountSwitcher.qml
index dd33c940..2c5d572e 100644
--- a/framework/qml/AccountSwitcher.qml
+++ b/framework/qml/AccountSwitcher.qml
@@ -44,7 +44,6 @@ Controls.ToolButton {
         id: accountsModel
     }
 
-
     onClicked: {
         popup.open()
     }
@@ -55,7 +54,7 @@ Controls.ToolButton {
         height: listView.count == 0 ? Kirigami.Units.gridUnit * 4 : Kirigami.Units.gridUnit * 2 + listView.count * Kirigami.Units.gridUnit * 3
         width: Kirigami.Units.gridUnit * 20
 
-        y: accountSwitcher.height
+        y: accountSwitcher.y - height
 
         modal: true
         focus: true
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index 0b161635..bd088525 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -35,9 +35,9 @@ Item {
     property string edit: "document-edit"
     property string replyToSender: "mail-reply-sender"
 
-    property string menu: "application-menu"
-    property string user: "im-user"
-    property string search: "edit-find"
+    property string menu_inverted: "application-menu-inverted"
+    property string user_inverted: "im-user-inverted"
+    property string search_inverted: "edit-find-inverted"
     property string goBack: "go-previous"
     property string goDown: "go-down"
     property string goUp: "go-down"