Changed resolve conflicts button

nextmcloud · Jan 12, 2024 · 99d7d32 · 99d7d32
1 parent 5e326de
commit 99d7d32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
@@ -115,13 +115,12 @@ RowLayout {
         }
 
         HoverHandler {
-            id: mouse
+            id: mouseSync
             acceptedDevices: PointerDevice.Mouse
         }
 
         background: Rectangle {
-            id: backgroundArea
-            color: mouse.hovered? Style.nmcSyncHoverColor : Style.nmcTelekomMagentaColor
+            color: mouseSync.hovered? Style.nmcSyncHoverColor : Style.nmcTelekomMagentaColor
             radius: Style.nmcStandardRadius
             height: Style.nmcTraySyncButtonHeight
         }
@@ -135,8 +134,9 @@ RowLayout {
         Layout.rightMargin: Style.trayHorizontalMargin
 
         text: qsTr("Resolve conflicts")
-        textColor: Style.adjustedCurrentUserHeaderColor
-        textColorHovered: Style.currentUserHeaderTextColor
+        padding: Style.smallSpacing
+        textColor: Style.nmcTextInButtonColor
+        textColorHovered: Style.nmcTextInButtonColor
         contentsFont.bold: true
         bgColor: Style.currentUserHeaderColor
 
@@ -146,5 +146,16 @@ RowLayout {
                  NC.UserModel.currentUser.isConnected
         enabled: visible
         onClicked: NC.Systray.createResolveConflictsDialog(activityModel.allConflicts);
+
+        HoverHandler {
+            id: mouseConflict
+            acceptedDevices: PointerDevice.Mouse
+        }
+
+        background: Rectangle {
+            color: mouseConflict.hovered? Style.nmcConflictHoverColor : Style.nmcConflictColor
+            radius: Style.nmcStandardRadius
+            height: Style.nmcTraySyncButtonHeight
+        }
     }
 }
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -206,8 +206,9 @@ QtObject {
     readonly property string nmcLogOutIcon: "qrc:///client/theme/logout.svg"
     readonly property string nmcRemoveIcon: "qrc:///client/theme/remove.svg"
     readonly property color nmcTelekomMagentaColor: "#E20074"
+    readonly property color nmcConflictColor: "#F97012"
+    readonly property color nmcConflictHoverColor: "#de6310"
     readonly property color nmcSyncHoverColor: "#c00063"
-    readonly property color nmcSyncPressColor: "#9e0051"
     readonly property color nmcSyncRefreshColor: "#2238df"
     readonly property int nmcTrayWindowAddAccountButtonHeight: 56
     readonly property int nmcTrayWindowHeaderHeight: 64
@@ -221,6 +222,7 @@ QtObject {
     readonly property int nmcMenuSubItemHeight: 40
     readonly property int nmcMenuSubItemLeftPadding: 16
     readonly property int nmcStandardRadius: 4
+    readonly property int nmcListViewLeftPadding: 10
     readonly property color nmcMenuMoreItemsColor: "#E5E5E5"
     readonly property color nmcTrayWindowHeaderBackgroundColor: "white"
     readonly property color nmcTrayWindowHeaderTextColor: "black"