mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 13:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2024-11-19 10:31:30 +08:00
parent 33d525069e
commit 874aaa35a0
No known key found for this signature in database
GPG key ID: C839200C384636B0
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/tray/NCProgressBar.qml
View file

@ -24,7 +24,7 @@ ProgressBar {
implicitHeight: Style.progressBarBackgroundHeight implicitHeight: Style.progressBarBackgroundHeight
radius: Style.progressBarRadius radius: Style.progressBarRadius
color: Style.progressBarBackgroundColor color: Style.progressBarBackgroundColor
border.color: Style.progressBarBackgroundBorderColor border.color: palette.dark
border.width: Style.progressBarBackgroundBorderWidth border.width: Style.progressBarBackgroundBorderWidth
} }
@ -36,8 +36,8 @@ ProgressBar {
width: control.visualPosition * parent.width width: control.visualPosition * parent.width
height: parent.height height: parent.height
radius: Style.progressBarRadius radius: Style.progressBarRadius
color: Style.progressBarContentColor color: palette.dark
border.color: Style.progressBarContentBorderColor border.color: palette.dark
border.width: Style.progressBarContentBorderWidth border.width: Style.progressBarContentBorderWidth
} }
} }

3
theme/Style/Style.qml
View file

@ -16,7 +16,6 @@ QtObject {
readonly property color ncSecondaryTextColor: "#808080" readonly property color ncSecondaryTextColor: "#808080"
readonly property color lightHover: Theme.darkMode ? Qt.lighter(backgroundColor, 2) : Qt.darker(backgroundColor, 1.05) 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 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: Theme.systemPalette.base readonly property color backgroundColor: Theme.systemPalette.base
readonly property color buttonBackgroundColor: Theme.systemPalette.button readonly property color buttonBackgroundColor: Theme.systemPalette.button
readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1) readonly property color positiveColor: Qt.rgba(0.38, 0.74, 0.38, 1)
@ -194,9 +193,7 @@ QtObject {
property int progressBarContentBorderWidth: 1 property int progressBarContentBorderWidth: 1
property int progressBarBackgroundBorderWidth: 1 property int progressBarBackgroundBorderWidth: 1
property color progressBarContentColor: ncBlue property color progressBarContentColor: ncBlue
property color progressBarContentBorderColor: menuBorder
property color progressBarBackgroundColor: backgroundColor property color progressBarBackgroundColor: backgroundColor
property color progressBarBackgroundBorderColor: menuBorder
property int newActivitiesButtonWidth: 150 property int newActivitiesButtonWidth: 150
property int newActivitiesButtonHeight: 40 property int newActivitiesButtonHeight: 40