edited Layout

Gui/SearchBar.qml

@@ -17,8 +17,8 @@ RowLayout
 
         Button
         {
-            icon.source: "qrc:/images/search.svg"
-            icon.color: "olive"
+            icon.source: "qrc:/images/MagnifyingGlass.svg"
+            icon.color: Colors.foreground
             x: parent.x + parent.width - width
             height: parent.height
             flat: true
@@ -28,8 +28,8 @@ RowLayout
         Button
         {
             id: filterBtn
-            icon.source: "qrc:/images/filter.svg"
-            icon.color: "olive"
+            icon.source: "qrc:/images/Funnel.svg"
+            icon.color: Colors.foreground
             x: parent.x + parent.width
             height: searchField.height
             flat: true

Gui/TopBar.qml

@@ -225,7 +225,8 @@ ColumnLayout
     BarButton
     {
         id: atajos
-
+        implicitWidth: 90
+        implicitHeight: 90
         checkable: false
         icon.source: "qrc:/images/Bars3.svg"
 

Gui/main.qml

@@ -47,8 +47,13 @@ ApplicationWindow
 
         anchors
         {
+            left: topBar.right
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+
+
 
-            fill: parent
             topMargin: Dimensions.l
             bottomMargin: Dimensions.l
             rightMargin: Dimensions.l

pyqcrm.qrc

@@ -16,7 +16,6 @@
         <file>fonts/RobotoCondensed.otf</file>
         <file>README</file>
         <file>LICENSE</file>
-<<<<<<< HEAD
         <file>images/tero.jpg</file>
         <file>images/dash.svg</file>
         <file>images/invoice.svg</file>
@@ -25,7 +24,5 @@
         <file>images/customer.svg</file>
         <file>images/contract.svg</file>
         <file>images/object.svg</file>
-=======
->>>>>>> main
     </qresource>
 </RCC>