From fec58c300b74a18b71f658826058491fd7f8c8e7 Mon Sep 17 00:00:00 2001
From: Anatasof Wirapraja <anatasof.wirapraja@gmail.com>
Date: Fri, 6 Sep 2019 16:04:28 +0700
Subject: deleted conflicted files

---
 pages/TaskListForm.ui.qml | 72 -----------------------------------------------
 1 file changed, 72 deletions(-)

(limited to 'pages')

diff --git a/pages/TaskListForm.ui.qml b/pages/TaskListForm.ui.qml
index 5e5734c..3e472b8 100644
--- a/pages/TaskListForm.ui.qml
+++ b/pages/TaskListForm.ui.qml
@@ -6,82 +6,10 @@ import QtQuick.Layouts 1.3
 ListView {
     width: 362
     spacing: 12
-    property alias menuButton: menuButton
 
     Rectangle {
         id: rectangle
         anchors.fill: parent
         z: -1
-
-        ToolBar {
-            id: toolbar
-            height: 56
-            font.family: "Google Sans"
-            anchors.top: parent.top
-            anchors.topMargin: 0
-            anchors.right: parent.right
-            anchors.rightMargin: 0
-            anchors.left: parent.left
-            anchors.leftMargin: 0
-            background: Rectangle {
-                color: "#FFF"
-            }
-
-            RowLayout {
-                anchors.fill: parent
-                spacing: 8
-
-                ToolButton {
-                    id: menuButton
-                    icon.name: "menu-icon"
-                    icon.source: "/assets/menu-24px.svg"
-                    highlighted: true
-                }
-                Label {
-                    id: title
-                    text: qsTr("Today")
-                    font.weight: Font.Medium
-                    wrapMode: Text.WordWrap
-                    color: "#000000"
-                    font.family: "Google Sans"
-                    font.pointSize: 20
-                    elide: Label.ElideRight
-                    horizontalAlignment: Text.AlignLeft
-                    verticalAlignment: Qt.AlignVCenter
-                    Layout.fillWidth: true
-                }
-                ToolButton {
-                }
-            }
-        }
-
-        RoundButton {
-            id: roundButton
-            width: 144
-            spacing: 8
-            height: 64
-
-            text: qsTr("New task")
-            padding: 16
-            font.capitalization: Font.MixedCase
-            font.family: "Google Sans"
-            font.pointSize: 16
-            font.weight: Font.Medium
-
-            rightPadding: 24
-            leftPadding: 16
-            bottomPadding: 16
-            topPadding: 16
-            autoExclusive: false
-            focusPolicy: Qt.NoFocus
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 16
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            highlighted: true
-
-            icon.name: "add-icon"
-            icon.source: "/assets/add-24px.svg"
-        }
     }
 }
-- 
cgit v1.2.3