Remove menuBorder Style variable, just use palette (as we have alread…

…y done in parts) Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Nov 19, 2024 · e1cb7ed · e1cb7ed
1 parent 6c8653f
commit e1cb7ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -18,7 +18,6 @@ QtObject {
     readonly property color ncSecondaryTextColor: "#808080"
     readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05)
     readonly property color darkerHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2.35) : Qt.darker(backgroundColor, 1.25)
-    readonly property color menuBorder: Theme.darkMode ? Qt.lighter(backgroundColor, 2.5) : Qt.darker(backgroundColor, 1.5)
     readonly property color backgroundColor: nativePalette.base
     readonly property color buttonBackgroundColor: nativePalette.button
     readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)
@@ -196,9 +195,7 @@ QtObject {
     property int progressBarContentBorderWidth: 1
     property int progressBarBackgroundBorderWidth: 1
     property color progressBarContentColor: ncBlue
-    property color progressBarContentBorderColor: menuBorder
     property color progressBarBackgroundColor: backgroundColor
-    property color progressBarBackgroundBorderColor: menuBorder
 
     property int newActivitiesButtonWidth: 150
     property int newActivitiesButtonHeight: 40