Merge master and fix conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/resources/qml/ui/Ripple.qml b/resources/qml/ui/Ripple.qml

index 9b404a68..93380f77 100644
--- a/resources/qml/ui/Ripple.qml
+++ b/resources/qml/ui/Ripple.qml
@@ -116,10 +116,10 @@ Item {
     ]
 
     Connections {
-        function onPressed(mouse) {
-            // Button
-            // Default to center
+        // Button
+        // Default to center
 
+        function onPressed(mouse) {
             // MouseArea
             if (mouse) {
                 ripple.centerX = mouse.x;