Remove menuBorder Style variable, just use palette (as we have already done in parts)

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/tray/NCProgressBar.qml b/src/gui/tray/NCProgressBar.qml
index c620f149a2ff54b781dca72dd0667af36cab3b09..5c0d2afb3d59b733b884df31fbac52526afe42ef 100644 (file)
--- a/src/gui/tray/NCProgressBar.qml
+++ b/src/gui/tray/NCProgressBar.qml
@@ -24,7 +24,7 @@ ProgressBar {
         implicitHeight: Style.progressBarBackgroundHeight
         radius: Style.progressBarRadius
         color: Style.progressBarBackgroundColor
-        border.color: Style.progressBarBackgroundBorderColor
+        border.color: palette.dark
         border.width: Style.progressBarBackgroundBorderWidth
     }
 
@@ -36,8 +36,8 @@ ProgressBar {
             width: control.visualPosition * parent.width
             height: parent.height
             radius: Style.progressBarRadius
-            color: Style.progressBarContentColor
-            border.color: Style.progressBarContentBorderColor
+            color: palette.dark
+            border.color: palette.dark
             border.width: Style.progressBarContentBorderWidth
         }
     }

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index d145b16c39c8db1dfe2d1182e65b3e2282b5a753..4ae40a68f2e53e10ee550b0ae30df878ec3dd54a 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -16,7 +16,6 @@ QtObject {
     readonly property color ncSecondaryTextColor: "#808080"\r
     readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)\r
     readonly property color darkerHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2.35) : Qt.darker(backgroundColor, 1.25)\r
-    readonly property color menuBorder: Theme.darkMode ? Qt.lighter(backgroundColor, 2.5) : Qt.darker(backgroundColor, 1.5)\r
     readonly property color backgroundColor: Theme.systemPalette.base\r
     readonly property color buttonBackgroundColor: Theme.systemPalette.button\r
     readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)\r
@@ -194,9 +193,7 @@ QtObject {
     property int progressBarContentBorderWidth: 1\r
     property int progressBarBackgroundBorderWidth: 1\r
     property color progressBarContentColor: ncBlue\r
-    property color progressBarContentBorderColor: menuBorder\r
     property color progressBarBackgroundColor: backgroundColor\r
-    property color progressBarBackgroundBorderColor: menuBorder\r
 \r
     property int newActivitiesButtonWidth: 150\r
     property int newActivitiesButtonHeight: 40\r